Changeset 54296 in webkit


Ignore:
Timestamp:
Feb 3, 2010 1:43:36 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-02-03 Kwang Yul Seo <skyul@company100.net>

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:
Location:
trunk/JavaScriptCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/ChangeLog

    r54294 r54296  
     12010-02-03  Kwang Yul Seo  <skyul@company100.net>
     2
     3        Reviewed by Eric Seidel.
     4
     5        [BREWMP] Remove COMPILE_ASSERT conflict with the underlying PLATFORM
     6        https://bugs.webkit.org/show_bug.cgi?id=34190
     7
     8        COMPILE_ASSERT conflicts with the underlying PLATFORM because it is defined
     9        both in WTF's Assertions.h and BREWMP's AEEClassIDs.h. Include AEEClassIDs.h
     10        in Assertions.h and undef COMPILE_ASSERT to avoid redefining COMPILE_ASSERT.
     11
     12        * wtf/Assertions.h:
     13
    1142010-02-03  Kwang Yul Seo  <skyul@company100.net>
    215
  • trunk/JavaScriptCore/wtf/Assertions.h

    r52973 r54296  
    180180#endif
    181181
     182#if PLATFORM(BREWMP)
     183/* FIXME: We include this here only to avoid a conflict with the COMPILE_ASSERT macro. */
     184#include <AEEClassIDs.h>
     185
     186/* FIXME: Change to use something other than COMPILE_ASSERT to avoid this conflict with the underlying platform */
     187#undef COMPILE_ASSERT
     188#endif
     189
    182190#if ASSERT_DISABLED
    183191
Note: See TracChangeset for help on using the changeset viewer.