[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
laszlo.1.gombos at nokia.com
laszlo.1.gombos at nokia.com
Fri Jan 21 14:56:48 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 999eac1b647fa2a6667d8ed0aa9a0dd2385b1c9d
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 5 05:48:18 2011 +0000
2011-01-04 Siddharth Mathur <siddharth.mathur at nokia.com>
Reviewed by Laszlo Gombos.
Include unistd.h for sleep() for non-Windows builds.
* WebProcess/WebProcess.cpp:
* WebProcess/qt/WebProcessMainQt.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75046 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 342b3ad..a937f64 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-04 Siddharth Mathur <siddharth.mathur at nokia.com>
+
+ Reviewed by Laszlo Gombos.
+
+ Include unistd.h for sleep() for non-Windows builds.
+
+ * WebProcess/WebProcess.cpp:
+ * WebProcess/qt/WebProcessMainQt.cpp:
+
2011-01-04 Brian Weinstein <bweinstein at apple.com>
Windows build fix. Change the inline type of consumePermanently.
diff --git a/WebKit2/WebProcess/WebProcess.cpp b/WebKit2/WebProcess/WebProcess.cpp
index f7ceadd..d38f06a 100644
--- a/WebKit2/WebProcess/WebProcess.cpp
+++ b/WebKit2/WebProcess/WebProcess.cpp
@@ -59,6 +59,10 @@
#include <WebCore/GCController.h>
#endif
+#if !OS(WINDOWS)
+#include <unistd.h>
+#endif
+
using namespace WebCore;
namespace WebKit {
diff --git a/WebKit2/WebProcess/qt/WebProcessMainQt.cpp b/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
index cb15c53..bd4e370 100644
--- a/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
+++ b/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
@@ -41,6 +41,12 @@
#include <MComponentData>
#endif
+#ifndef NDEBUG
+#if !OS(WINDOWS)
+#include <unistd.h>
+#endif
+#endif
+
#if !defined(QWEBKIT_EXPORT)
#if defined(QT_SHARED)
#define QWEBKIT_EXPORT Q_DECL_EXPORT
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list