diff options
| author | Steve Block <steveblock@google.com> | 2011-06-02 04:01:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-02 04:01:03 -0700 |
| commit | 1b22c7a9c33756726c60ab2c9c67d4bbeac153ce (patch) | |
| tree | 021579cfddc0861b15ce6a35c9030ff5f66c04fb /Source/WebCore | |
| parent | 6d45935b4d405c4f9fc71e9a4b6499268c39a9d9 (diff) | |
| parent | 6d8f06eaadcb30642ddca3d2ceff6cf840a5d143 (diff) | |
| download | external_webkit-1b22c7a9c33756726c60ab2c9c67d4bbeac153ce.zip external_webkit-1b22c7a9c33756726c60ab2c9c67d4bbeac153ce.tar.gz external_webkit-1b22c7a9c33756726c60ab2c9c67d4bbeac153ce.tar.bz2 | |
Merge "JavaScriptCore/config.h should not include WebCore/config.h"
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/config.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/WebCore/config.h b/Source/WebCore/config.h index 64901db..176cd5b 100644 --- a/Source/WebCore/config.h +++ b/Source/WebCore/config.h @@ -81,12 +81,6 @@ // ANDROID def should be after all PLATFORM to avoid override. #if PLATFORM(ANDROID) -// Android uses a single set of include directories when building WebKit and -// JavaScriptCore. Since WebCore/ is included before JavaScriptCore/, Android -// includes JavaScriptCore/config.h explicitly here to make sure it gets picked -// up. -#include <JavaScriptCore/config.h> - #define WEBCORE_NAVIGATOR_VENDOR "Google Inc." // This must be defined before we include FastMalloc.h, below. #define USE_SYSTEM_MALLOC 1 @@ -210,6 +204,9 @@ #define WTF_USE_CHROME_NETWORK_STACK 0 #endif /* !defined(WTF_USE_CHROME_NETWORK_STACK) */ +// This is present in JavaScriptCore/config.h, which Android does not use. +#define WTF_CHANGES 1 + #endif /* PLATFORM(ANDROID) */ #ifdef __cplusplus |