[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b861a6a52fa967f1f9f16e7dd7206292eac254e5
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 10 20:07:32 2011 +0000

    2011-01-10  Siddharth Mathur  <siddharth.mathur at nokia.com>
    
            Reviewed by Eric Seidel.
    
            Support for ARM's RVCT(ARMCC) compiler in import/export directives
            https://bugs.webkit.org/show_bug.cgi?id=52146
    
            * Shared/API/c/WKBase.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75404 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index e7dd9a0..f886855 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-10  Siddharth Mathur  <siddharth.mathur at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Support for ARM's RVCT(ARMCC) compiler in import/export directives
+        https://bugs.webkit.org/show_bug.cgi?id=52146 
+
+        * Shared/API/c/WKBase.h:
+
 2011-01-10  Sam Weinig  <sam at webkit.org>
 
         Fix the build.
diff --git a/WebKit2/Shared/API/c/WKBase.h b/WebKit2/Shared/API/c/WKBase.h
index 0f0dad9..a0e9dd9 100644
--- a/WebKit2/Shared/API/c/WKBase.h
+++ b/WebKit2/Shared/API/c/WKBase.h
@@ -101,9 +101,9 @@ typedef const struct OpaqueWKBundleScriptWorld* WKBundleScriptWorldRef;
 #undef WK_EXPORT
 #if defined(WK_NO_EXPORT)
 #define WK_EXPORT
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && !defined(__ARMCC__)
 #define WK_EXPORT __attribute__((visibility("default")))
-#elif defined(WIN32) || defined(_WIN32)
+#elif defined(WIN32) || defined(_WIN32) || defined(__ARMCC__)
 #if BUILDING_WEBKIT
 #define WK_EXPORT __declspec(dllexport)
 #else

-- 
WebKit Debian packaging