[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 28c6b2fa99deb08095012bb1b1f2aa546fe00b9e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 22 18:36:41 2009 +0000

    2009-12-22  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Darin Adler.
    
            Define ALWAYS_INLINE and WTF_PRIVATE_INLINE to __forceinline for RVCT
            https://bugs.webkit.org/show_bug.cgi?id=32853
    
            Use __forceinline forces RVCT to compile a C or C++ function
            inline. The compiler attempts to inline the function, regardless of
            the characteristics of the function.
    
            * wtf/AlwaysInline.h:
            * wtf/FastMalloc.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52490 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1fa4dbf..deb22d0 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-22  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Darin Adler.
+
+        Define ALWAYS_INLINE and WTF_PRIVATE_INLINE to __forceinline for RVCT
+        https://bugs.webkit.org/show_bug.cgi?id=32853
+
+        Use __forceinline forces RVCT to compile a C or C++ function
+        inline. The compiler attempts to inline the function, regardless of
+        the characteristics of the function.
+
+        * wtf/AlwaysInline.h:
+        * wtf/FastMalloc.h:
+
 2009-12-21  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Prospective GTK build fix: Add UStringImpl.cpp/h to the build.
diff --git a/JavaScriptCore/wtf/AlwaysInline.h b/JavaScriptCore/wtf/AlwaysInline.h
index 64fdd99..4e7224c 100644
--- a/JavaScriptCore/wtf/AlwaysInline.h
+++ b/JavaScriptCore/wtf/AlwaysInline.h
@@ -23,7 +23,7 @@
 #ifndef ALWAYS_INLINE
 #if COMPILER(GCC) && defined(NDEBUG) && !COMPILER(MINGW)
 #define ALWAYS_INLINE inline __attribute__((__always_inline__))
-#elif COMPILER(MSVC) && defined(NDEBUG)
+#elif (COMPILER(MSVC) || COMPILER(RVCT)) && defined(NDEBUG)
 #define ALWAYS_INLINE __forceinline
 #else
 #define ALWAYS_INLINE inline
diff --git a/JavaScriptCore/wtf/FastMalloc.h b/JavaScriptCore/wtf/FastMalloc.h
index abe4a58..9a35c75 100644
--- a/JavaScriptCore/wtf/FastMalloc.h
+++ b/JavaScriptCore/wtf/FastMalloc.h
@@ -198,7 +198,7 @@ using WTF::fastMallocAllow;
 #define WTF_PRIVATE_INLINE __private_extern__ inline __attribute__((always_inline))
 #elif COMPILER(GCC)
 #define WTF_PRIVATE_INLINE inline __attribute__((always_inline))
-#elif COMPILER(MSVC)
+#elif COMPILER(MSVC) || COMPILER(RVCT)
 #define WTF_PRIVATE_INLINE __forceinline
 #else
 #define WTF_PRIVATE_INLINE inline

-- 
WebKit Debian packaging