2009-11-13 Norbert Leser <norbert.leser&nokia.com>

        Reviewed by Eric Seidel.

        Added macros for USERINCLUDE paths within symbian blocks
        to guarantee inclusion of respective header files from local path
        first (to avoid clashes with same names of header files in system include path).

        * JavaScriptCore.pri:
2009-11-13  Norbert Leser  <norbert.leser&nokia.com>

        Reviewed by Eric Seidel.

        Added macros for USERINCLUDE paths within symbian blocks
        to guarantee inclusion of respective header files from local path
        first (to avoid clashes with same names of header files in system include path).

        * WebCore.pro:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@50970 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3f39e6b90638e4d9cc6a46d559b6e6f2bea26a68..896a13f8e95beaf7ca42043ea64b39faceeec3fd 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-13  Norbert Leser  <norbert.leser&nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Added macros for USERINCLUDE paths within symbian blocks
+        to guarantee inclusion of respective header files from local path
+        first (to avoid clashes with same names of header files in system include path).
+
+        * JavaScriptCore.pri:
+

 2009-11-13  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Geoff Garen.
 2009-11-13  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Geoff Garen.

diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index 295ee2ca6c5105cec40d4881856245ec654343f1..ce0a89ad8fc6fce3ed2b0add2f6610dd69d52665 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -9,6 +9,11 @@ CONFIG(debug, debug|release) {
     OBJECTS_DIR = obj/release
 }
 
     OBJECTS_DIR = obj/release
 }
 

+symbian: {
+    # Need to guarantee this comes before system includes of /epoc32/include
+    MMP_RULES += "USERINCLUDE ../JavaScriptCore/profiler"
+}
+

 INCLUDEPATH = \
     $$PWD \
     $$PWD/.. \
 INCLUDEPATH = \
     $$PWD \
     $$PWD/.. \

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 227f6fb0eacbf011764b59ee32e11c9431dfa9f9..6d5d2051a07f938b75c7c176185616651da92b30 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-13  Norbert Leser  <norbert.leser&nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Added macros for USERINCLUDE paths within symbian blocks
+        to guarantee inclusion of respective header files from local path
+        first (to avoid clashes with same names of header files in system include path).
+
+        * WebCore.pro:
+

 2009-11-13  Hironori Bono  <hbono@chromium.org>
 
         Reviewed by Oliver Hunt.
 2009-11-13  Hironori Bono  <hbono@chromium.org>
 
         Reviewed by Oliver Hunt.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 415b22d96b26d564945b857ba4d9f18c067705a2..f889ede62ef1f12c570af70ca82a6330d6110813 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -12,6 +12,9 @@ symbian: {
     DEPLOYMENT += webkitlibs
 
     TARGET.UID3 = 0x200267C2
     DEPLOYMENT += webkitlibs
 
     TARGET.UID3 = 0x200267C2

+    # Need to guarantee that these come before system includes of /epoc32/include
+    MMP_RULES += "USERINCLUDE rendering"
+    MMP_RULES += "USERINCLUDE platform/text"

     # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target.
     # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
     MMP_RULES += "LINKEROPTION  armcc --rw-base 0xE00000"
     # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target.
     # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
     MMP_RULES += "LINKEROPTION  armcc --rw-base 0xE00000"