Modified: trunk/Source/_javascript_Core/ChangeLog (86907 => 86908)
--- trunk/Source/_javascript_Core/ChangeLog 2011-05-20 00:12:31 UTC (rev 86907)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-05-20 00:20:11 UTC (rev 86908)
@@ -1,5 +1,13 @@
2011-05-19 Oliver Hunt <[email protected]>
+ Fix windows build.
+
+ * wtf/OSAllocatorWin.cpp:
+ (WTF::OSAllocator::reserveUncommitted):
+ (WTF::OSAllocator::reserveAndCommit):
+
+2011-05-19 Oliver Hunt <[email protected]>
+
Reviewed by Gavin Barraclough.
Add guard pages to each end of the memory region used by the fixedvm allocator
Modified: trunk/Source/_javascript_Core/wtf/OSAllocatorWin.cpp (86907 => 86908)
--- trunk/Source/_javascript_Core/wtf/OSAllocatorWin.cpp 2011-05-20 00:12:31 UTC (rev 86907)
+++ trunk/Source/_javascript_Core/wtf/OSAllocatorWin.cpp 2011-05-20 00:20:11 UTC (rev 86908)
@@ -38,7 +38,7 @@
(writable ? PAGE_READWRITE : PAGE_READONLY);
}
-void* OSAllocator::reserveUncommitted(size_t bytes, Usage, bool writable, bool executable)
+void* OSAllocator::reserveUncommitted(size_t bytes, Usage, bool writable, bool executable, bool)
{
void* result = VirtualAlloc(0, bytes, MEM_RESERVE, protection(writable, executable));
if (!result)
@@ -46,7 +46,7 @@
return result;
}
-void* OSAllocator::reserveAndCommit(size_t bytes, Usage, bool writable, bool executable)
+void* OSAllocator::reserveAndCommit(size_t bytes, Usage, bool writable, bool executable, bool)
{
void* result = VirtualAlloc(0, bytes, MEM_RESERVE | MEM_COMMIT, protection(writable, executable));
if (!result)
