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

Timestamp:

Feb 3, 2010, 1:43:36 PM (15 years ago)

Author:

[email protected]

Message:

2010-02-03 Kwang Yul Seo <​[email protected]>

Reviewed by Eric Seidel.

[BREWMP] Remove COMPILE_ASSERT conflict with the underlying PLATFORM
​https://bugs.webkit.org/show_bug.cgi?id=34190

COMPILE_ASSERT conflicts with the underlying PLATFORM because it is defined
both in WTF's Assertions.h and BREWMP's AEEClassIDs.h. Include AEEClassIDs.h
in Assertions.h and undef COMPILE_ASSERT to avoid redefining COMPILE_ASSERT.

• wtf/Assertions.h:

File:

• trunk/JavaScriptCore/wtf/Assertions.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/Assertions.h

@@ -180 +180 @@
 #endif
 
+#if PLATFORM(BREWMP)
+/* FIXME: We include this here only to avoid a conflict with the COMPILE_ASSERT macro. */
+#include <AEEClassIDs.h>
+
+/* FIXME: Change to use something other than COMPILE_ASSERT to avoid this conflict with the underlying platform */
+#undef COMPILE_ASSERT
+#endif
+
 #if ASSERT_DISABLED