[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the webkit-1.3 branch:
commit d104ad891e706fd68f91c8bbe1dd6297166d2dc1
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 14 19:50:47 2011 +0000

    2011-01-14  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Align import/export directives
            https://bugs.webkit.org/show_bug.cgi?id=52208
    
            * API/JSBase.h: Align import/export directives with
            WebKit2/Shared/API/c/WKBase.h
    2011-01-14  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Align import/export directives
            https://bugs.webkit.org/show_bug.cgi?id=52208
    
            * Shared/API/c/WKBase.h: Align import/export directives with
            JavaScriptCore/API/JSBase.h.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75806 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/API/JSBase.h b/Source/JavaScriptCore/API/JSBase.h
index 2e16720..d962b01 100644
--- a/Source/JavaScriptCore/API/JSBase.h
+++ b/Source/JavaScriptCore/API/JSBase.h
@@ -63,21 +63,22 @@ typedef const struct OpaqueJSValue* JSValueRef;
 typedef struct OpaqueJSValue* JSObjectRef;
 
 /* JavaScript symbol exports */
+/* These rules should stay the same as in WebKit2/Shared/API/c/WKBase.h */
 
 #undef JS_EXPORT
 #if defined(JS_NO_EXPORT)
-    #define JS_EXPORT
+#define JS_EXPORT
 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
-    #define JS_EXPORT __attribute__((visibility("default")))
-#elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE)
-    #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
-        #define JS_EXPORT __declspec(dllexport)
-    #else
-        #define JS_EXPORT __declspec(dllimport)
-    #endif
+#define JS_EXPORT __attribute__((visibility("default")))
+#elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__)
+#if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
+#define JS_EXPORT __declspec(dllexport)
 #else
-    #define JS_EXPORT
+#define JS_EXPORT __declspec(dllimport)
 #endif
+#else /* !defined(JS_NO_EXPORT) */
+#define JS_EXPORT
+#endif /* defined(JS_NO_EXPORT) */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index cd4aff8..539ae8f 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-14  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Align import/export directives
+        https://bugs.webkit.org/show_bug.cgi?id=52208
+
+        * API/JSBase.h: Align import/export directives with
+        WebKit2/Shared/API/c/WKBase.h
+
 2011-01-14  Michael Saboff  <msaboff at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8d63ce1..f65dac9 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-14  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Align import/export directives
+        https://bugs.webkit.org/show_bug.cgi?id=52208
+
+        * Shared/API/c/WKBase.h: Align import/export directives with
+        JavaScriptCore/API/JSBase.h.
+
 2011-01-14  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebKit2/Shared/API/c/WKBase.h b/WebKit2/Shared/API/c/WKBase.h
index 5c29db0..f906f9f 100644
--- a/WebKit2/Shared/API/c/WKBase.h
+++ b/WebKit2/Shared/API/c/WKBase.h
@@ -99,19 +99,21 @@ typedef const struct OpaqueWKBundlePageOverlay* WKBundlePageOverlayRef;
 typedef const struct OpaqueWKBundleRangeHandle* WKBundleRangeHandleRef;
 typedef const struct OpaqueWKBundleScriptWorld* WKBundleScriptWorldRef;
 
+/* These rules should stay the same as in JavaScriptCore/API/JSBase.h */
+
 #undef WK_EXPORT
 #if defined(WK_NO_EXPORT)
 #define WK_EXPORT
-#elif defined(__GNUC__) && !defined(__ARMCC__)
+#elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
 #define WK_EXPORT __attribute__((visibility("default")))
-#elif defined(WIN32) || defined(_WIN32) || defined(__ARMCC__)
+#elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__)
 #if BUILDING_WEBKIT
 #define WK_EXPORT __declspec(dllexport)
 #else
 #define WK_EXPORT __declspec(dllimport)
 #endif
-#else
+#else /* !defined(WK_NO_EXPORT) */
 #define WK_EXPORT
-#endif
+#endif /* defined(WK_NO_EXPORT) */
 
 #endif /* WKBase_h */

-- 
WebKit Debian packaging