diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/pending/KURL.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/pending/KURL.h b/webkit/pending/KURL.h index c2817a5..b7c4cb2 100644 --- a/webkit/pending/KURL.h +++ b/webkit/pending/KURL.h @@ -32,6 +32,11 @@ #include "CString.h" #include "googleurl/src/url_canon.h" #include "googleurl/src/url_parse.h" +// TODO(brettw): Crazy hack. Because these headers pull in base/basictypes.h, +// which redefines COMPILE_ASSERT, restore it here to the definition in +// wtf/Assertions.h. +#undef COMPILE_ASSERT +#define COMPILE_ASSERT(exp, name) typedef int dummy##name [(exp) ? 1 : -1]; #endif #if PLATFORM(CF) |