[webkit-changes] cvs commit: JavaScriptCore/kxmlcore Assertions.h

[Alexey]

ap          06/01/07 02:22:45

  Modified:    .        ChangeLog
               kxmlcore Assertions.h
  Log:
          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.
  
  Revision  Changes    Path
  1.950     +9 -0      JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.949
  retrieving revision 1.950
  diff -u -r1.949 -r1.950
  --- ChangeLog	6 Jan 2006 23:50:57 -0000	1.949
  +++ ChangeLog	7 Jan 2006 10:22:44 -0000	1.950
  @@ -1,3 +1,12 @@
  +2006-01-07  Alexey Proskuryakov  <ap at 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 at apple.com>
   
   	Reviewed by Darin.
  
  
  
  1.3       +10 -10    JavaScriptCore/kxmlcore/Assertions.h
  
  Index: Assertions.h
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/kxmlcore/Assertions.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Assertions.h	6 Jan 2006 22:43:43 -0000	1.2
  +++ Assertions.h	7 Jan 2006 10:22:45 -0000	1.3
  @@ -105,7 +105,7 @@
   #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 @@
           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 @@
   // 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 @@
   // 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