diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 18:46:40 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 18:46:40 +0000 |
| commit | 43390223664bd9e55d33b56799e3d98d5504be6b (patch) | |
| tree | 247531d999c44f8ba121eafa07be607bace01a02 /webkit/config.h.in | |
| parent | 7e1e1d207ef6e11fb5790b95c737c9b1f4ffdada (diff) | |
| download | chromium_src-43390223664bd9e55d33b56799e3d98d5504be6b.zip chromium_src-43390223664bd9e55d33b56799e3d98d5504be6b.tar.gz chromium_src-43390223664bd9e55d33b56799e3d98d5504be6b.tar.bz2 | |
Chrome side of unforking. I need to pull WebKit with the change that unforks KURL.h
This makes us defile USE(GOOGLEURL) and use that instead of USE_GOOGLE_URL_LIBRARY.
I also fixed some places to be able to compile without it if possible (I think
I will be wanting that capability in the future to test changes they may make
upstream).
Review URL: http://codereview.chromium.org/14494
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/config.h.in')
| -rw-r--r-- | webkit/config.h.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/config.h.in b/webkit/config.h.in index 015e9f0..45609d7 100644 --- a/webkit/config.h.in +++ b/webkit/config.h.in @@ -122,6 +122,9 @@ #endif #if PLATFORM(CHROMIUM) + +#define WTF_USE_GOOGLEURL 1 + #if !PLATFORM(DARWIN) // Don't define SKIA on Mac. Undefine other things as well that might get set // as side-effects. |