From 6d8f06eaadcb30642ddca3d2ceff6cf840a5d143 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 1 Jun 2011 18:41:18 +0100 Subject: JavaScriptCore/config.h should not include WebCore/config.h All WebKit ports other than Chromium use a separate set of include paths for building JSC vs WebCore, so source files pick up the appropriate version of config.h. Android uses a single set of include paths, so gets aroud this problem by adding WebCore/ to the include path first and including JavaScriptCore/config.h from WebCore/config.h. This is ugly and will cause problems in an upcoming merge due to new macros being defined in both files. The two files are very similar. JavaScriptCore/config.h adds only the following two defines ... - HAVE_STDINT_H - This is not used on Android - WTF_CHANGES This patch removes the include of JavaScriptCore/config.h from WebCore/config.h and adds WTF_CHANGES for Android. Note that Chromium uses only WebCore/config.h and adds WTF_CHANGES in a similar way. Change-Id: Ib9c93eda0023096aa40dde947b5a476c207542e0 --- Source/WebCore/config.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Source/WebCore') diff --git a/Source/WebCore/config.h b/Source/WebCore/config.h index 781762a..a226fbe 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 - #define WEBCORE_NAVIGATOR_VENDOR "Google Inc." // This must be defined before we include FastMalloc.h, below. #define USE_SYSTEM_MALLOC 1 @@ -212,6 +206,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 -- cgit v1.1