[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3d2e1adc4f68683d97e0429bead6d86592c9ec17
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 28 16:58:28 2009 +0000

    2009-12-28  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Maciej Stachowiak.
    
            Cleanup of #define JS_EXPORT.
    
            * API/JSBase.h:
    2009-12-28  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Maciej Stachowiak.
    
            Use JS_NO_EXPORT for JSBase.h.
    
            * wxwk-settings.bkl:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52598 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/API/JSBase.h b/JavaScriptCore/API/JSBase.h
index d1ce9b3..2e16720 100644
--- a/JavaScriptCore/API/JSBase.h
+++ b/JavaScriptCore/API/JSBase.h
@@ -65,27 +65,15 @@ typedef struct OpaqueJSValue* JSObjectRef;
 /* JavaScript symbol exports */
 
 #undef JS_EXPORT
-#if defined(BUILDING_WX__)
+#if defined(JS_NO_EXPORT)
     #define JS_EXPORT
 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
     #define JS_EXPORT __attribute__((visibility("default")))
-#elif defined(_WIN32_WCE)
-    #if defined(JS_BUILDING_JS)
-        #define JS_EXPORT __declspec(dllexport)
-    #elif defined(JS_IMPORT_JS)
-        #define JS_EXPORT __declspec(dllimport)
-    #else
-        #define JS_EXPORT
-    #endif
-#elif defined(WIN32) || defined(_WIN32)
-    /*
-     * TODO: Export symbols with JS_EXPORT when using MSVC.
-     * See http://bugs.webkit.org/show_bug.cgi?id=16227
-     */
+#elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE)
     #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
-    #define JS_EXPORT __declspec(dllexport)
+        #define JS_EXPORT __declspec(dllexport)
     #else
-    #define JS_EXPORT __declspec(dllimport)
+        #define JS_EXPORT __declspec(dllimport)
     #endif
 #else
     #define JS_EXPORT
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b91e20e..5a9a813 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-28  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Cleanup of #define JS_EXPORT.
+
+        * API/JSBase.h:
+
 2009-12-27  Patrick Gansterer  <paroga at paroga.com>
 
         Reviewed by Adam Barth.
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index b842511..94d969b 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-28  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Use JS_NO_EXPORT for JSBase.h.
+
+        * wxwk-settings.bkl:
+
 2009-12-20  Kevin Ollivier  <kevino at theolliviers.com>
 
         [wx] build fixes after recent changes.
diff --git a/WebKit/wx/wxwk-settings.bkl b/WebKit/wx/wxwk-settings.bkl
index d51c18a..3675e59 100644
--- a/WebKit/wx/wxwk-settings.bkl
+++ b/WebKit/wx/wxwk-settings.bkl
@@ -52,6 +52,7 @@ JavaScriptCore Bakefile project file.
         <cxx-exceptions>on</cxx-exceptions>
         <define>BUILDING_WX__=1</define>
         <define>ENABLE_DOM_STORAGE</define>
+        <define>JS_NO_EXPORT</define>
         <define>
             $(substituteFromDict(DEBUG,{'1':'','0':'NDEBUG'}))
         </define>

-- 
WebKit Debian packaging