[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
barraclough at apple.com
barraclough at apple.com
Wed Dec 22 11:43:22 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 97c90196bb8a31082702dc139c1f1a35632d568e
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 5 00:53:18 2010 +0000
Windows build fix.
* wtf/PageReservation.h:
(WTF::PageReservation::systemReserve):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64700 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index bab9c47..62ca10c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
2010-08-04 Gavin Barraclough <barraclough at apple.com>
+ Windows build fix.
+
+ * wtf/PageReservation.h:
+ (WTF::PageReservation::systemReserve):
+
+2010-08-04 Gavin Barraclough <barraclough at apple.com>
+
Build fix - add new header to !Mac projects.
* GNUmakefile.am:
diff --git a/JavaScriptCore/wtf/PageReservation.h b/JavaScriptCore/wtf/PageReservation.h
index f068120..78f76e3 100644
--- a/JavaScriptCore/wtf/PageReservation.h
+++ b/JavaScriptCore/wtf/PageReservation.h
@@ -215,10 +215,12 @@ inline void PageReservation::systemDecommit(void* start, size_t size)
inline PageReservation PageReservation::systemReserve(size_t size, Usage usage, bool writable, bool executable)
{
// Record the protection for use during commit.
- m_protection = executable ?
+ DWORD protection = executable ?
(writable ? PAGE_EXECUTE_READWRITE : PAGE_EXECUTE_READ) :
(writable ? PAGE_READWRITE : PAGE_READONLY);
- return PageReservation(VirtualAlloc(0, size, MEM_RESERVE, m_protection), size);
+ PageReservation reservation(VirtualAlloc(0, size, MEM_RESERVE, m_protection), size);
+ reservation.m_protection = protection;
+ return reservation;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list