From 6f65cc3b4114080938c42bc1f3f55c0188f27163 Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Wed, 8 Jul 2009 18:26:51 +0000 Subject: Suppress a warning about LOG being re-defined. temporary_glue.cc includes webview_impl.h, which brings in headers that include wtf/Assertions.h. However, it also brings in logging.h. The workaround is to include wtf/Assertions.h in temporary_glue.cc and then #undef LOG. This effectively mimics what we do elsewhere in glue. TEST=none BUG=none R=brettw Review URL: http://codereview.chromium.org/149339 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20172 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/temporary_glue.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'webkit/glue/temporary_glue.cc') diff --git a/webkit/glue/temporary_glue.cc b/webkit/glue/temporary_glue.cc index fb201b1..23724ed 100644 --- a/webkit/glue/temporary_glue.cc +++ b/webkit/glue/temporary_glue.cc @@ -5,6 +5,9 @@ #include "config.h" #include "webkit/api/src/TemporaryGlue.h" +#include +#undef LOG + #include "webkit/glue/webview_impl.h" using WebCore::Frame; -- cgit v1.1