Chromium Code Reviews| Index: sky/engine/wtf/StringExtras.h |
| diff --git a/sky/engine/wtf/StringExtras.h b/sky/engine/wtf/StringExtras.h |
| index f58985066c06e9ff313ef2122019b960754381fc..256f10808a5cd870f2ecac88342eca3121a27403 100644 |
| --- a/sky/engine/wtf/StringExtras.h |
| +++ b/sky/engine/wtf/StringExtras.h |
| @@ -26,70 +26,10 @@ |
| #ifndef WTF_StringExtras_h |
| #define WTF_StringExtras_h |
| -#if OS(POSIX) |
| -#define HAVE_STRINGS_H 1 |
| -#endif |
| - |
| -#if !defined(HAVE_STRNSTR) |
|
ojan
2014/11/11 23:35:48
Do we know this is always false?
|
| -#if OS(MACOSX) || (OS(FREEBSD) && !defined(__GLIBC__)) |
| -#define HAVE_STRNSTR 1 |
| -#endif |
| -#endif |
| - |
| #include <stdarg.h> |
| #include <stdio.h> |
| #include <string.h> |
| - |
| -#if HAVE(STRINGS_H) |
| #include <strings.h> |
| -#endif |
| - |
| -#if COMPILER(MSVC) |
| -// FIXME: why a COMPILER check instead of OS? also, these should be HAVE checks |
| - |
| -inline int snprintf(char* buffer, size_t count, const char* format, ...) |
| -{ |
| - int result; |
| - va_list args; |
| - va_start(args, format); |
| - result = _vsnprintf(buffer, count, format, args); |
| - va_end(args); |
| - |
| - // In the case where the string entirely filled the buffer, _vsnprintf will not |
| - // null-terminate it, but snprintf must. |
| - if (count > 0) |
| - buffer[count - 1] = '\0'; |
| - |
| - return result; |
| -} |
| - |
| -inline double wtf_vsnprintf(char* buffer, size_t count, const char* format, va_list args) |
| -{ |
| - int result = _vsnprintf(buffer, count, format, args); |
| - |
| - // In the case where the string entirely filled the buffer, _vsnprintf will not |
| - // null-terminate it, but vsnprintf must. |
| - if (count > 0) |
| - buffer[count - 1] = '\0'; |
| - |
| - return result; |
| -} |
| - |
| -// Work around a difference in Microsoft's implementation of vsnprintf, where |
| -// vsnprintf does not null terminate the buffer. WebKit can rely on the null termination. |
| -#define vsnprintf(buffer, count, format, args) wtf_vsnprintf(buffer, count, format, args) |
| - |
| -inline int strncasecmp(const char* s1, const char* s2, size_t len) |
| -{ |
| - return _strnicmp(s1, s2, len); |
| -} |
| - |
| -inline int strcasecmp(const char* s1, const char* s2) |
| -{ |
| - return _stricmp(s1, s2); |
| -} |
| - |
| -#endif |
| #if !HAVE(STRNSTR) |