[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:29:17 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 71bdfc8cda6c11dbf855bf5de95487c7e17de835
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 27 06:04:19 2010 +0000
Windows build fix from Chromium/GTK build fix!
* wtf/PageAllocation.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64108 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 976da20..38f469f 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,11 @@
2010-07-26 Gavin Barraclough <barraclough at apple.com>
+ Windows build fix from Chromium/GTK build fix!
+
+ * wtf/PageAllocation.cpp:
+
+2010-07-26 Gavin Barraclough <barraclough at apple.com>
+
Chromium/GTK build fix
* wtf/PageAllocation.cpp:
diff --git a/JavaScriptCore/wtf/PageAllocation.cpp b/JavaScriptCore/wtf/PageAllocation.cpp
index ab74305..2e5f9cf 100644
--- a/JavaScriptCore/wtf/PageAllocation.cpp
+++ b/JavaScriptCore/wtf/PageAllocation.cpp
@@ -27,14 +27,13 @@
#include "config.h"
#include "PageAllocation.h"
-#include <unistd.h>
-
#if HAVE(ERRNO_H)
#include <errno.h>
#endif
#if HAVE(MMAP)
#include <sys/mman.h>
+#include <unistd.h>
#endif
#if OS(WINDOWS)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list