[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 807a3eb35090158f21203d77407a39f740f66c9a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 15:53:45 2010 +0000

    2010-10-05  Kristian Monsen  <kristianm at google.com>
    
            Reviewed by Steve Block.
    
            Including JavaScriptCore/config.h from WebCore/config.h
            instead of from WebCorePrefix.h.
            https://bugs.webkit.org/show_bug.cgi?id=47179
    
            No new tests, just changing where files are included.
    
            * WebCorePrefix.h:
            * config.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fdb42c8..510b944 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-05  Kristian Monsen  <kristianm at google.com>
+
+        Reviewed by Steve Block.
+
+        Including JavaScriptCore/config.h from WebCore/config.h
+        instead of from WebCorePrefix.h.
+        https://bugs.webkit.org/show_bug.cgi?id=47179
+
+        No new tests, just changing where files are included.
+
+        * WebCorePrefix.h:
+        * config.h:
+
 2010-10-05  Jakob Petsovits  <jpetsovits at rim.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h
index cde5a85..a871e4c 100644
--- a/WebCore/WebCorePrefix.h
+++ b/WebCore/WebCorePrefix.h
@@ -70,11 +70,6 @@
 #define PREFIX_FOR_WEBCORE 1
 #define EXPORT __attribute__((visibility("default")))
 #endif
-// 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>
 #endif
 
 #if !defined(BUILDING_BREWMP__)
diff --git a/WebCore/config.h b/WebCore/config.h
index ad0767c..6d9a2f1 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -80,6 +80,12 @@
 #endif /* OS(WINDOWS) */
 
 #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

-- 
WebKit Debian packaging