Changeset 11918 in webkit for trunk/JavaScriptCore/kxmlcore/Assertions.h

Timestamp:

Jan 6, 2006, 2:43:44 PM (19 years ago)

Author:

hyatt

Message:

Land all the changes to make JSCore build again on windows.

File:

• trunk/JavaScriptCore/kxmlcore/Assertions.h (modified) (9 diffs)

trunk/JavaScriptCore/kxmlcore/Assertions.h

@@ -36 +36 @@
 // Defining any of the symbols explicitly prevents this from having any effect.
 
+#ifdef WIN32
+#define ASSERT_DISABLED 1 // FIXME: We have to undo all the assert macros, since they are currently in a .mm file and use obj-c.
+#else
 #ifdef NDEBUG
 #define ASSERTIONS_DISABLED_DEFAULT 1
 #else
 #define ASSERTIONS_DISABLED_DEFAULT 0
+#endif
 #endif
 
@@ -62 +66 @@
 #endif
 
+#ifdef __GNUC__
+#define KXMLCORE_PRETTY_FUNCTION __PRETTY_FUNCTION__
+#else
+#define KXMLCORE_PRETTY_FUNCTION __FUNCTION__
+#endif
+
 // These helper functions are always declared, but not necessarily always defined if the corresponding function is disabled.
 
@@ -75 +85 @@
     KXCLogChannelState state;
 } KXCLogChannel;
-    
+
 void KXCReportAssertionFailure(const char *file, int line, const char *function, const char *assertion);
 void KXCReportAssertionFailureWithMessage(const char *file, int line, const char *function, const char *assertion, const char *format, ...);
@@ -96 +106 @@
 
 #define ASSERT(assertion) ((void)0)
-#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs...) ((void)0)
+#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs, ...) ((void)0)
 #define ASSERT_NOT_REACHED() ((void)0)
 
@@ -103 +113 @@
 #define ASSERT(assertion) do \
     if (!(assertion)) { \
-        KXCReportAssertionFailure(__FILE__, __LINE__, __PRETTY_FUNCTION__, #assertion); \
+        KXCReportAssertionFailure(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #assertion); \
         CRASH(); \
     } \
 while (0)
-#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs...) do \
+#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs, ...) do \
     if (!(assertion)) { \
-        KXCReportAssertionFailureWithMessage(__FILE__, __LINE__, __PRETTY_FUNCTION__, #assertion, formatAndArgs); \
+        KXCReportAssertionFailureWithMessage(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #assertion, formatAndArgs); \
         CRASH(); \
     } \
 while (0)
 #define ASSERT_NOT_REACHED() do { \
-    KXCReportAssertionFailure(__FILE__, __LINE__, __PRETTY_FUNCTION__, 0); \
+    KXCReportAssertionFailure(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, 0); \
     CRASH(); \
 } while (0)
@@ -130 +140 @@
 #define ASSERT_ARG(argName, assertion) do \
     if (!(assertion)) { \
-        KXCReportArgumentAssertionFailure(__FILE__, __LINE__, __PRETTY_FUNCTION__, #argName, #assertion); \
+        KXCReportArgumentAssertionFailure(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #argName, #assertion); \
         CRASH(); \
     } \
@@ -140 +150 @@
 
 #if FATAL_DISABLED
-#define FATAL(formatAndArgs...) ((void)0)
+#define FATAL(formatAndArgs, ...) ((void)0)
 #else
-#define FATAL(formatAndArgs...) do { \
-    KXCReportFatalError(__FILE__, __LINE__, __PRETTY_FUNCTION__, formatAndArgs); \
+#define FATAL(formatAndArgs, ...) do { \
+    KXCReportFatalError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, formatAndArgs); \
     CRASH(); \
 } while (0)
@@ -151 +161 @@
 
 #if ERROR_DISABLED
-#define ERROR(formatAndArgs...) ((void)0)
+#define ERROR(formatAndArgs, ...) ((void)0)
 #else
-#define ERROR(formatAndArgs...) KXCReportError(__FILE__, __LINE__, __PRETTY_FUNCTION__, formatAndArgs)
+#define ERROR(formatAndArgs, ...) KXCReportError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, formatAndArgs)
 #endif
 
@@ -159 +169 @@
 
 #if LOG_DISABLED
-#define LOG(channel, formatAndArgs...) ((void)0)
+#define LOG(channel, formatAndArgs, ...) ((void)0)
 #else
-#define LOG(channel, formatAndArgs...) KXCLog(__FILE__, __LINE__, __PRETTY_FUNCTION__, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), formatAndArgs)
+#define LOG(channel, formatAndArgs, ...) KXCLog(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), formatAndArgs)
 #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