[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
bweinstein at apple.com
bweinstein at apple.com
Wed Dec 22 15:46:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 2e6925a7c6cd142cacd404c87c5fb77993ae1369
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 12 00:28:38 2010 +0000
More Windows build fixing. Change another #import to a #include, and remove an unneeded
namespace.
* UIProcess/win/WebInspectorProxyWin.cpp:
* WebProcess/WebPage/win/WebInspectorWin.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71864 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8e3e6ab..5a15842 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-11 Brian Weinstein <bweinstein at apple.com>
+
+ More Windows build fixing. Change another #import to a #include, and remove an unneeded
+ namespace.
+
+ * UIProcess/win/WebInspectorProxyWin.cpp:
+ * WebProcess/WebPage/win/WebInspectorWin.cpp:
+
2010-11-11 Brent Fulgham <bfulgham at webkit.org>
Windows [Cairo] build fix. Unreviewed.
diff --git a/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp b/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp
index 18bf4bd..cfc1298 100644
--- a/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp
+++ b/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp
@@ -30,8 +30,6 @@
#define DISABLE_NOT_IMPLEMENTED_WARNINGS 1
#include "NotImplemented.h"
-using namespace WebCore;
-
namespace WebKit {
WebPageProxy* WebInspectorProxy::platformCreateInspectorPage()
diff --git a/WebKit2/WebProcess/WebPage/win/WebInspectorWin.cpp b/WebKit2/WebProcess/WebPage/win/WebInspectorWin.cpp
index db5ef82..7e77705 100644
--- a/WebKit2/WebProcess/WebPage/win/WebInspectorWin.cpp
+++ b/WebKit2/WebProcess/WebPage/win/WebInspectorWin.cpp
@@ -23,9 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WebInspector.h"
+#include "WebInspector.h"
-#import <wtf/text/WTFString.h>
+#include <wtf/text/WTFString.h>
#define DISABLE_NOT_IMPLEMENTED_WARNINGS 1
#include "NotImplemented.h"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list