diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 17:56:39 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 17:56:39 +0000 |
| commit | 9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7 (patch) | |
| tree | 258cddf035cb585b515ee8d69bc58b3e4e9d8620 /webkit/glue/npruntime_util.cc | |
| parent | 81f3095725e27bc914f5ce85d99a929f76a347d3 (diff) | |
| download | chromium_src-9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7.zip chromium_src-9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7.tar.gz chromium_src-9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7.tar.bz2 | |
Landing 37604:38097 merge
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/npruntime_util.cc')
| -rw-r--r-- | webkit/glue/npruntime_util.cc | 1 |
1 files changed, 1 insertions, 0 deletions
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 |