Changeset 26589 in webkit for trunk/JavaScriptCore/wtf/StringExtras.h

Timestamp:

Oct 14, 2007, 4:55:02 AM (18 years ago)

Author:

bdash

Message:

2007-10-14 Kevin Ollivier <​[email protected]>

Reviewed by Adam.

Add support for MSVC7, and fix cases where PLATFORM(WIN) should
be PLATFORM(WIN_OS) for other ports building on Windows.

• dom/XMLTokenizer.cpp:
• page/FrameTree.cpp:
• platform/StaticConstructors.h:
• platform/String.cpp:

2007-10-5 Kevin Ollivier <​[email protected]>

Reviewed by Adam.

Add support for MSVC7, and fix cases where PLATFORM(WIN) should
be PLATFORM(WIN_OS) for other ports building on Windows.

• kjs/DateMath.cpp: (KJS::getDSTOffsetSimple):
• kjs/JSImmediate.h:
• wtf/Assertions.cpp:
• wtf/Assertions.h:
• wtf/Platform.h:
• wtf/StringExtras.h: (snprintf): (vsnprintf):

File:

• trunk/JavaScriptCore/wtf/StringExtras.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/StringExtras.h

@@ -34 +34 @@
 inline int snprintf(char *str, size_t size, const char* format, ...) 
 {
+    int result;
     va_list args;
     va_start(args, format);
-    return _vsnprintf(str, size, format, args);
+    result = _vsnprintf(str, size, format, args);
+    va_end(args);
+    return result;
 }
+
+#if COMPILER(MSVC7)
+// MSVC8 and above define this function
+#define vsnprintf snprintf
+#endif
 
 inline int strncasecmp(const char* s1, const char* s2, size_t len) { return strnicmp(s1, s2, len); }