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

paroga at webkit.org paroga at webkit.org
Sun Feb 20 23:37:51 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 95057d9353d7fa8fc5483e1c493436072c32fb0c
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 22 11:36:49 2011 +0000

    2011-01-22  Patrick Gansterer  <paroga at webkit.org>
    
            Unreviewed WinCE build fix for r76430.
    
            * runtime/MachineStackMarker.cpp:
            (JSC::swapIfBackwards):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76441 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index cb3c861..ab15dd7 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-22  Patrick Gansterer  <paroga at webkit.org>
+
+        Unreviewed WinCE build fix for r76430.
+
+        * runtime/MachineStackMarker.cpp:
+        (JSC::swapIfBackwards):
+
 2011-01-21  Geoffrey Garen  <ggaren at apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/Source/JavaScriptCore/runtime/MachineStackMarker.cpp b/Source/JavaScriptCore/runtime/MachineStackMarker.cpp
index e914ec2..79f9cc4 100644
--- a/Source/JavaScriptCore/runtime/MachineStackMarker.cpp
+++ b/Source/JavaScriptCore/runtime/MachineStackMarker.cpp
@@ -78,7 +78,7 @@ static inline void swapIfBackwards(void*& begin, void*& end)
 #if OS(WINCE)
     if (begin <= end)
         return;
-    swap(begin, end);
+    std::swap(begin, end);
 #else
 UNUSED_PARAM(begin);
 UNUSED_PARAM(end);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list