Changeset 37604 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 15, 2008, 9:42:43 AM (17 years ago)

Author:

Darin Adler

Message:

2008-10-15 Joerg Bornemann <​[email protected]>

Reviewed by Darin Adler.

• part of ​https://bugs.webkit.org/show_bug.cgi?id=20746 Fix compilation on Windows CE.

str(n)icmp, strdup and vsnprintf are not available on Windows CE,
they are called _str(n)icmp, etc. instead

• wtf/StringExtras.h: Added inline function implementations.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/StringExtras.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-15  Joerg Bornemann  <[email protected]>
+
+        Reviewed by Darin Adler.
+
+        - part of https://bugs.webkit.org/show_bug.cgi?id=20746
+          Fix compilation on Windows CE.
+
+        str(n)icmp, strdup and vsnprintf are not available on Windows CE,
+        they are called _str(n)icmp, etc. instead
+
+        * wtf/StringExtras.h: Added inline function implementations.
+
 2008-10-15  Gabor Loki  <[email protected]>
 

trunk/JavaScriptCore/wtf/StringExtras.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2006 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +27 @@
 #define WTF_StringExtras_h
 
+#include <stdarg.h>
 #include <stdio.h>
-#include <stdarg.h>
 
 #if COMPILER(MSVC)
 
-inline int snprintf(char *str, size_t size, const char* format, ...) 
+inline int snprintf(char* buffer, size_t count, const char* format, ...) 
 {
     int result;
     va_list args;
     va_start(args, format);
-    result = _vsnprintf(str, size, format, args);
+    result = _vsnprintf(buffer, count, format, args);
     va_end(args);
     return result;
 }
 
-#if COMPILER(MSVC7)
-// MSVC8 and above define this function
-#define vsnprintf snprintf
+#if COMPILER(MSVC7) || PLATFORM(WIN_CE)
+
+inline int vsnprintf(char* buffer, size_t count, const char* format, va_list args)
+{
+    return _vsnprintf(buffer, count, format, args);
+}
+
 #endif
 
-inline int strncasecmp(const char* s1, const char* s2, size_t len) { return strnicmp(s1, s2, len); }
+#if PLATFORM(WIN_CE)
 
-inline int strcasecmp(const char* s1, const char* s2) { return stricmp(s1, s2); }
+inline int strnicmp(const char* string1, const char* string2, size_t count)
+{
+    return _strnicmp(string1, string2, count);
+}
+
+inline int stricmp(const char* string1, const char* string2)
+{
+    return _stricmp(string1, string2);
+}
+
+inline char* strdup(const char* strSource)
+{
+    return _strdup(strSource);
+}
+
+#endif
+
+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