diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 20:40:42 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 20:40:42 +0000 |
| commit | 041a6e09b0de89118267ba308caff2a191f08ea6 (patch) | |
| tree | 11364f5a3a868a57315985742ebd235ad1b8f38e | |
| parent | cd927cda1f32d2b03d2f958b1086e2c996e5f649 (diff) | |
| download | chromium_src-041a6e09b0de89118267ba308caff2a191f08ea6.zip chromium_src-041a6e09b0de89118267ba308caff2a191f08ea6.tar.gz chromium_src-041a6e09b0de89118267ba308caff2a191f08ea6.tar.bz2 | |
base/logging.h defines LOG when webkit is about to so undef it
Review URL: http://codereview.chromium.org/6204
Patch from icefox.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3042 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/SConscript | 4 | ||||
| -rw-r--r-- | webkit/glue/glue_util.cc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript index f1da5da..88093aa 100644 --- a/webkit/glue/SConscript +++ b/webkit/glue/SConscript @@ -18,9 +18,10 @@ if env['PLATFORM'] == 'win32': ) input_files = [ + 'glue_util.cc', + 'image_decoder.cc', 'webkit_glue.cc', 'weburlrequest_impl.cc', - 'image_decoder.cc', ] if env['PLATFORM'] == 'win32': @@ -48,7 +49,6 @@ if env['PLATFORM'] == 'win32': 'feed_preview.cc', 'glue_accessibility.cc', 'glue_serialize.cc', - 'glue_util.cc', 'image_resource_fetcher.cc', 'inspector_client_impl.cc', 'localized_strings.cc', diff --git a/webkit/glue/glue_util.cc b/webkit/glue/glue_util.cc index ad2f2ce..357bb34 100644 --- a/webkit/glue/glue_util.cc +++ b/webkit/glue/glue_util.cc @@ -9,6 +9,7 @@ #include "base/string_util.h" #pragma warning(push, 0) +#undef LOG #include "CString.h" #include "PlatformString.h" #pragma warning(pop) |