diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 11:00:17 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 11:00:17 +0000 |
| commit | 87eeadf86b9dd876c79c3d75323f5b0d50c3cb69 (patch) | |
| tree | dee5694fe4f86635e8e106f44caebf966c6bb26e /webkit/glue | |
| parent | 8b0957b11b8c7519d926d1ddc3e1f91c799b9763 (diff) | |
| download | chromium_src-87eeadf86b9dd876c79c3d75323f5b0d50c3cb69.zip chromium_src-87eeadf86b9dd876c79c3d75323f5b0d50c3cb69.tar.gz chromium_src-87eeadf86b9dd876c79c3d75323f5b0d50c3cb69.tar.bz2 | |
Fix another insert of the LOG() macro being defined twice
which just appeared with the latest roll of webkit (on Linux)
Add temporary exceptions to test_expectations.txt
BUG=None
TEST=None
TBR=mbelshe@chromium.org
Review URL: http://codereview.chromium.org/164471
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/entity_map.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/glue/entity_map.cc b/webkit/glue/entity_map.cc index 0654481..26f094f 100644 --- a/webkit/glue/entity_map.cc +++ b/webkit/glue/entity_map.cc @@ -4,6 +4,8 @@ #include "config.h" +#undef LOG + #include "webkit/glue/entity_map.h" #include "base/hash_tables.h" |