Changeset 11922 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 7, 2006, 2:22:45 AM (19 years ago)

Author:

ap

Message:

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.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kxmlcore/Assertions.h (modified) (5 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-01-07  Alexey Proskuryakov  <[email protected]>
+
+        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  <[email protected]>
 

trunk/JavaScriptCore/kxmlcore/Assertions.h

@@ -106 +106 @@
 
 #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)
 
@@ -117 +117 @@
     } \
 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(); \
     } \
@@ -150 +150 @@
 
 #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)
@@ -161 +161 @@
 
 #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
 
@@ -169 +169 @@
 
 #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