Changeset 26589 in webkit for trunk/JavaScriptCore/wtf/Assertions.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/Assertions.h (modified) (7 diffs)

trunk/JavaScriptCore/wtf/Assertions.h

@@ -36 +36 @@
    For non-debug builds, everything is disabled by default.
    Defining any of the symbols explicitly prevents this from having any effect.
+   
+   MSVC7 note: variadic macro support was added in MSVC8, so for now we disable
+   those macros in MSVC7. For more info, see the MSDN document on variadic 
+   macros here:
+   
+   http://msdn2.microsoft.com/en-us/library/ms177415(VS.80).aspx
 */
 
@@ -131 +137 @@
     } \
 while (0)
+#if COMPILER(MSVC7)
+#define ASSERT_WITH_MESSAGE(assertion) ((void)0)
+#else
 #define ASSERT_WITH_MESSAGE(assertion, ...) do \
     if (!(assertion)) { \
@@ -137 +146 @@
     } \
 while (0)
+#endif // COMPILER(MSVC7)
 #define ASSERT_NOT_REACHED() do { \
     WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, 0); \
@@ -170 +180 @@
 #if FATAL_DISABLED
 #define FATAL(...) ((void)0)
+#elif COMPILER(MSVC7)
+#define FATAL() ((void)0)
 #else
 #define FATAL(...) do { \
@@ -181 +193 @@
 #if ERROR_DISABLED
 #define LOG_ERROR(...) ((void)0)
+#elif COMPILER(MSVC7)
+#define LOG_ERROR() ((void)0)
 #else
 #define LOG_ERROR(...) WTFReportError(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, __VA_ARGS__)
@@ -189 +203 @@
 #if LOG_DISABLED
 #define LOG(channel, ...) ((void)0)
+#elif COMPILER(MSVC7)
+#define LOG() ((void)0)
 #else
 #define LOG(channel, ...) WTFLog(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
@@ -199 +215 @@
 #if LOG_DISABLED
 #define LOG_VERBOSE(channel, ...) ((void)0)
+#elif COMPILER(MSVC7)
+#define LOG_VERBOSE(channel) ((void)0)
 #else
 #define LOG_VERBOSE(channel, ...) WTFLogVerbose(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)