From 13cb86d508a2af29cda7a8336a3375ccddab1bd0 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Tue, 5 Oct 2010 13:18:43 +0100 Subject: Don't include JavaScriptCore/config.h from WebCore/WebCorePrefix.h This is a cherry-pick of the following upstream CL: https://bugs.webkit.org/show_bug.cgi?id=47179 This violates the rules at the top of the file, and means that it will be included before any other includes for all compilation units. We are now just including JavaScriptCore/config.h from WebCore/config.h so if you include one you get both. This created a compile error in V8Counters.cpp, which is also fixed Change-Id: I272247161877ddc680b3aab509bc413ab3445219 --- WebKit/android/WebCoreSupport/V8Counters.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'WebKit') diff --git a/WebKit/android/WebCoreSupport/V8Counters.cpp b/WebKit/android/WebCoreSupport/V8Counters.cpp index 4e7351d..d164f9a 100644 --- a/WebKit/android/WebCoreSupport/V8Counters.cpp +++ b/WebKit/android/WebCoreSupport/V8Counters.cpp @@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if USE(V8) #ifdef ANDROID_INSTRUMENT @@ -31,12 +30,14 @@ #include "config.h" #include "V8Counters.h" -#include "NotImplemented.h" +#include "NotImplemented.h" #include #include #include +#if USE(V8) + namespace WebCore { V8Counters::Counter::Counter(bool isHistogram) -- cgit v1.1