Reviewed by Maciej.
authorap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 7 Jan 2006 10:22:45 +0000 (10:22 +0000)
committerap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 7 Jan 2006 10:22:45 +0000 (10:22 +0000)
- Fix WebCore development build
http://bugzilla.opendarwin.org/show_bug.cgi?id=6408

        * kxmlcore/Assertions.h: Use __VA_ARGS__ in variadic macros.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@11922 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/kxmlcore/Assertions.h

index 705c4b5e5d2e22db44b10f8996ecb8d2399dd738..044facfacee6785571063deec8979b7abf5a0b8e 100644 (file)
@@ -1,3 +1,12 @@
+2006-01-07  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Maciej.
+
+       - Fix WebCore development build
+       http://bugzilla.opendarwin.org/show_bug.cgi?id=6408
+
+        * kxmlcore/Assertions.h: Use __VA_ARGS__ in variadic macros.
+
 2006-01-06  Maciej Stachowiak  <mjs@apple.com>
 
        Reviewed by Darin.
index cf40ddee9e944143f93ebedbbbb7b75de5753b81..c821c854e75cc7024f1d2157554b09816093535f 100644 (file)
@@ -105,7 +105,7 @@ void KXCLog(const char *file, int line, const char *function, KXCLogChannel *cha
 #if ASSERT_DISABLED
 
 #define ASSERT(assertion) ((void)0)
-#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs, ...) ((void)0)
+#define ASSERT_WITH_MESSAGE(assertion, ...) ((void)0)
 #define ASSERT_NOT_REACHED() ((void)0)
 
 #else
@@ -116,9 +116,9 @@ void KXCLog(const char *file, int line, const char *function, KXCLogChannel *cha
         CRASH(); \
     } \
 while (0)
-#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs, ...) do \
+#define ASSERT_WITH_MESSAGE(assertion, ...) do \
     if (!(assertion)) { \
-        KXCReportAssertionFailureWithMessage(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #assertion, formatAndArgs); \
+        KXCReportAssertionFailureWithMessage(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #assertion, __VA_ARGS__); \
         CRASH(); \
     } \
 while (0)
@@ -149,10 +149,10 @@ while (0)
 // FATAL
 
 #if FATAL_DISABLED
-#define FATAL(formatAndArgs, ...) ((void)0)
+#define FATAL(...) ((void)0)
 #else
-#define FATAL(formatAndArgs, ...) do { \
-    KXCReportFatalError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, formatAndArgs); \
+#define FATAL(...) do { \
+    KXCReportFatalError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, __VA_ARGS__); \
     CRASH(); \
 } while (0)
 #endif
@@ -160,17 +160,17 @@ while (0)
 // ERROR
 
 #if ERROR_DISABLED
-#define ERROR(formatAndArgs, ...) ((void)0)
+#define ERROR(...) ((void)0)
 #else
-#define ERROR(formatAndArgs, ...) KXCReportError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, formatAndArgs)
+#define ERROR(...) KXCReportError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, __VA_ARGS__)
 #endif
 
 // LOG
 
 #if LOG_DISABLED
-#define LOG(channel, formatAndArgs, ...) ((void)0)
+#define LOG(channel, ...) ((void)0)
 #else
-#define LOG(channel, formatAndArgs, ...) KXCLog(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), formatAndArgs)
+#define LOG(channel, ...) KXCLog(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
 #define JOIN_LOG_CHANNEL_WITH_PREFIX(prefix, channel) JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel)
 #define JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel) prefix ## channel
 #endif