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

[ggaren at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 46903abac311e9510c0e23afdd1ec16c6d86a602
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 22 06:50:19 2011 +0000

    Try to fix build: moved helper function out of #ifdef.
    
    * runtime/MachineStackMarker.cpp:
    (JSC::swapIfBackwards):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76431 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index ea93c00..b107417 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-21  Geoffrey Garen  <ggaren at apple.com>
 
+        Try to fix build: moved helper function out of #ifdef.
+
+        * runtime/MachineStackMarker.cpp:
+        (JSC::swapIfBackwards):
+
+2011-01-21  Geoffrey Garen  <ggaren at apple.com>
+
         Rubber-stamped by Maciej Stachowiak.
 
         A few of Maciej's review suggestions for my last patch.
diff --git a/Source/JavaScriptCore/runtime/MachineStackMarker.cpp b/Source/JavaScriptCore/runtime/MachineStackMarker.cpp
index b7b71ed..e914ec2 100644
--- a/Source/JavaScriptCore/runtime/MachineStackMarker.cpp
+++ b/Source/JavaScriptCore/runtime/MachineStackMarker.cpp
@@ -73,6 +73,18 @@
 
 namespace JSC {
 
+static inline void swapIfBackwards(void*& begin, void*& end)
+{
+#if OS(WINCE)
+    if (begin <= end)
+        return;
+    swap(begin, end);
+#else
+UNUSED_PARAM(begin);
+UNUSED_PARAM(end);
+#endif
+}
+
 #if ENABLE(JSC_MULTIPLE_THREADS)
 
 #if OS(DARWIN)
@@ -135,18 +147,6 @@ static inline PlatformThread getCurrentPlatformThread()
 #endif
 }
 
-static inline void swapIfBackwards(void*& begin, void*& end)
-{
-#if OS(WINCE)
-    if (begin <= end)
-        return;
-    swap(begin, end);
-#else
-UNUSED_PARAM(begin);
-UNUSED_PARAM(end);
-#endif
-}
-
 void MachineStackMarker::makeUsableFromMultipleThreads()
 {
     if (m_currentThreadRegistrar)

-- 
WebKit Debian packaging