diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 23:56:26 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 23:56:26 +0000 |
| commit | 498fca602694169c686e796a051bb696482ba321 (patch) | |
| tree | 023fb41b75772e5d7f3b0101788d48bb1e673ca4 /webkit/api | |
| parent | 4739354ca60bbb00ecbf0824c87fa11f45757402 (diff) | |
| download | chromium_src-498fca602694169c686e796a051bb696482ba321.zip chromium_src-498fca602694169c686e796a051bb696482ba321.tar.gz chromium_src-498fca602694169c686e796a051bb696482ba321.tar.bz2 | |
WTF and PCRE should use JavaScriptCore/config.h and WebCore should use
WebCore/config.h.
I cleaned up the config target in webkit.gyp so it doesn't copy config.h
around. This way wtf/pcre and webcore each use the appropriate config file.
Tested on mac/linux/win platforms.
Patch by Yaar Schnitman <yaar@chromium.org>
Code review URL: http://codereview.chromium.org/196098
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/api')
| -rw-r--r-- | webkit/api/src/WebBindings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/api/src/WebBindings.cpp b/webkit/api/src/WebBindings.cpp index f4567d4..6dac134 100644 --- a/webkit/api/src/WebBindings.cpp +++ b/webkit/api/src/WebBindings.cpp @@ -35,7 +35,7 @@ #include "npruntime_priv.h" #include "webkit/api/public/WebDragData.h" -#if USE(V8_BINDING) +#if USE(V8) #include "ChromiumDataObject.h" #include "ClipboardChromium.h" #include "EventNames.h" @@ -43,7 +43,7 @@ #include "NPV8Object.h" // for PrivateIdentifier #include "V8Helpers.h" #include "V8Proxy.h" -#elif USE(JAVASCRIPTCORE_BINDINGS) +#elif USE(JSC) #include "bridge/c/c_utility.h" #endif |