From 9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7 Mon Sep 17 00:00:00 2001 From: "dglazkov@google.com" Date: Mon, 10 Nov 2008 17:56:39 +0000 Subject: Landing 37604:38097 merge git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5110 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/npruntime_util.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'webkit/glue/npruntime_util.cc') diff --git a/webkit/glue/npruntime_util.cc b/webkit/glue/npruntime_util.cc index 364401f..ced8f04 100644 --- a/webkit/glue/npruntime_util.cc +++ b/webkit/glue/npruntime_util.cc @@ -11,6 +11,7 @@ #include "webkit/port/bindings/v8/np_v8object.h" #elif USE(JAVASCRIPTCORE_BINDINGS) #include "bridge/c/c_utility.h" +#undef LOG using JSC::Bindings::PrivateIdentifier; #endif -- cgit v1.1