diff options
Diffstat (limited to 'webkit/glue')
| -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) |