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

barraclough at apple.com barraclough at apple.com
Mon Dec 27 16:28:21 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 2c0b6c30751ae37a4b1b43ce984fa0600af64d67
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 00:04:31 2010 +0000

    Eeeep! build fix!
    
    * wtf/OSAllocator.h:
    (WTF::OSAllocator::decommitAndRelease):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74434 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index cf3d463..1b12815 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-12-21  Gavin Barraclough  <barraclough at apple.com>
 
+        Eeeep! build fix!
+
+        * wtf/OSAllocator.h:
+        (WTF::OSAllocator::decommitAndRelease):
+
+2010-12-21  Gavin Barraclough  <barraclough at apple.com>
+
         Ooops, fixed typo in comment.
 
         * wtf/OSAllocator.h:
diff --git a/JavaScriptCore/wtf/OSAllocator.h b/JavaScriptCore/wtf/OSAllocator.h
index a50feb8..577a6b8 100644
--- a/JavaScriptCore/wtf/OSAllocator.h
+++ b/JavaScriptCore/wtf/OSAllocator.h
@@ -26,6 +26,8 @@
 #ifndef OSAllocator_h
 #define OSAllocator_h
 
+#include <wtf/UnusedParam.h>
+#include <wtf/VMTags.h>
 #include <wtf/VMTags.h>
 
 namespace WTF {
@@ -79,6 +81,9 @@ inline void OSAllocator::decommitAndRelease(void* releaseBase, size_t releaseSiz
     // On most platforms we can actually skip this final decommit; releasing the VM will
     // implicitly decommit any physical memory in the region. This is not true on WINCE.
     decommit(decommitBase, decommitSize);
+#else
+    UNUSED_PARAM(decommitBase);
+    UNUSED_PARAM(decommitSize);
 #endif
     releaseDecommitted(releaseBase, releaseSize);
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list