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

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 10ece1c99f58421e20058a04a36d15f282e60e56
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 23 00:39:13 2010 +0000

    2010-12-22  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Unreviewed build fix.
    
            [Symbian] Make sure OSAllocatorSymbian builds
    
            This patch only addresses the build problem.
    
            https://bugs.webkit.org/show_bug.cgi?id=51128 tracks the full
            (re)implementation of the Symbian allocator.
    
            * wtf/OSAllocatorSymbian.cpp:
            (WTF::OSAllocator::reserveUncommitted):
            (WTF::OSAllocator::reserveAndCommit):
            (WTF::OSAllocator::commit):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74520 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1c28826..69b6d3b 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-22  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Unreviewed build fix.
+
+        [Symbian] Make sure OSAllocatorSymbian builds
+
+        This patch only addresses the build problem.
+
+        https://bugs.webkit.org/show_bug.cgi?id=51128 tracks the full
+        (re)implementation of the Symbian allocator.
+
+        * wtf/OSAllocatorSymbian.cpp:
+        (WTF::OSAllocator::reserveUncommitted):
+        (WTF::OSAllocator::reserveAndCommit):
+        (WTF::OSAllocator::commit):
+
 2010-12-22  Dan Bernstein  <mitz at apple.com>
 
         Changed WebKitTools to Tools.
diff --git a/JavaScriptCore/wtf/OSAllocatorSymbian.cpp b/JavaScriptCore/wtf/OSAllocatorSymbian.cpp
index d9cbcf5..e746fde 100644
--- a/JavaScriptCore/wtf/OSAllocatorSymbian.cpp
+++ b/JavaScriptCore/wtf/OSAllocatorSymbian.cpp
@@ -30,17 +30,17 @@
 
 namespace WTF {
 
-void* OSAllocator::reserveUncommitted(size_t, Usage, bool, bool)
+void* OSAllocator::reserveUncommitted(size_t bytes, Usage, bool, bool)
 {
     return fastMalloc(bytes);
 }
 
 void* OSAllocator::reserveAndCommit(size_t bytes, Usage, bool, bool)
 {
-    return reserve(bytes);
+    return fastMalloc(bytes);
 }
 
-void OSAllocator::commit(void*, size_t, Usage, bool, bool)
+void OSAllocator::commit(void*, size_t, bool, bool)
 {
 }
 

-- 
WebKit Debian packaging