diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-10 00:07:53 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-10 00:07:53 +0000 |
| commit | 67d57f2929b328f22da139d2c218bfa1a7458ca7 (patch) | |
| tree | bb7f4d4a5d4ca258b946772191b4193ccb83232c /webkit/pending | |
| parent | 6b3531280db5c7a6080dee26a0637553ca4af642 (diff) | |
| download | chromium_src-67d57f2929b328f22da139d2c218bfa1a7458ca7.zip chromium_src-67d57f2929b328f22da139d2c218bfa1a7458ca7.tar.gz chromium_src-67d57f2929b328f22da139d2c218bfa1a7458ca7.tar.bz2 | |
Hack around macro conflict problems in KURL.h.
Review URL: http://codereview.chromium.org/7041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/pending')
| -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) |