Changeset 48629 in webkit for trunk/JavaScriptCore/wtf/Assertions.h

Timestamp:

Sep 22, 2009, 5:57:53 AM (16 years ago)

Author:

Simon Hausmann

Message:

Disable variadic macros on MSVC7.

Patch by Kent Hansen <​[email protected]> on 2009-09-22
Reviewed by Simon Hausmann.

This was originally added in r26589 but not extended
when LOG_DISABLED/ASSERT_DISABLED was introduced.

• wtf/Assertions.h:

File:

• trunk/JavaScriptCore/wtf/Assertions.h (modified) (5 diffs)

trunk/JavaScriptCore/wtf/Assertions.h

@@ -145 +145 @@
 
 #define ASSERT(assertion) ((void)0)
+#if COMPILER(MSVC7)
+#define ASSERT_WITH_MESSAGE(assertion) ((void)0)
+#else
 #define ASSERT_WITH_MESSAGE(assertion, ...) ((void)0)
+#endif /* COMPILER(MSVC7) */
 #define ASSERT_NOT_REACHED() ((void)0)
 #define ASSERT_UNUSED(variable, assertion) ((void)variable)
@@ -200 +204 @@
 /* FATAL */
 
-#if FATAL_DISABLED
+#if FATAL_DISABLED && !COMPILER(MSVC7)
 #define FATAL(...) ((void)0)
 #elif COMPILER(MSVC7)
@@ -213 +217 @@
 /* LOG_ERROR */
 
-#if ERROR_DISABLED
+#if ERROR_DISABLED && !COMPILER(MSVC7)
 #define LOG_ERROR(...) ((void)0)
 #elif COMPILER(MSVC7)
@@ -223 +227 @@
 /* LOG */
 
-#if LOG_DISABLED
+#if LOG_DISABLED && !COMPILER(MSVC7)
 #define LOG(channel, ...) ((void)0)
 #elif COMPILER(MSVC7)
@@ -235 +239 @@
 /* LOG_VERBOSE */
 
-#if LOG_DISABLED
+#if LOG_DISABLED && !COMPILER(MSVC7)
 #define LOG_VERBOSE(channel, ...) ((void)0)
 #elif COMPILER(MSVC7)