[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
ggaren at apple.com
ggaren at apple.com
Wed Dec 22 17:53:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ab9e41828ff26852c8173cbd1704e8d75659212b
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 2 02:42:23 2010 +0000
Windows build fix: commit doesn't have a return value.
* wtf/OSAllocatorWin.cpp:
(WTF::OSAllocator::commit):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73096 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ed46a53..0602eb0 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
2010-12-01 Geoffrey Garen <ggaren at apple.com>
+ Windows build fix: commit doesn't have a return value.
+
+ * wtf/OSAllocatorWin.cpp:
+ (WTF::OSAllocator::commit):
+
+2010-12-01 Geoffrey Garen <ggaren at apple.com>
+
Build fix: Export some symbols.
* JavaScriptCore.exp:
diff --git a/JavaScriptCore/wtf/OSAllocatorWin.cpp b/JavaScriptCore/wtf/OSAllocatorWin.cpp
index d9b6f61..eb21e37 100644
--- a/JavaScriptCore/wtf/OSAllocatorWin.cpp
+++ b/JavaScriptCore/wtf/OSAllocatorWin.cpp
@@ -42,7 +42,7 @@ void* OSAllocator::reserveAndCommit(size_t bytes)
void OSAllocator::commit(void* address, size_t bytes)
{
- return VirtualAlloc(address, bytes, MEM_COMMIT, PAGE_READWRITE);
+ VirtualAlloc(address, bytes, MEM_COMMIT, PAGE_READWRITE);
}
void OSAllocator::decommit(void* address, size_t bytes)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list