[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jberlin at webkit.org
jberlin at webkit.org
Wed Dec 22 12:56:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f5c6cfe71881ec4477ea13bf8a027e63e3fc81f6
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 2 16:31:31 2010 +0000
2010-09-02 Jessie Berlin <jberlin at apple.com>
Windows build fix. Unreviewed.
* UIProcess/API/win/WKAPICastWin.h:
(toWK):
* UIProcess/API/win/WKBaseWin.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66673 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 7449fc8..a59e4de 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-02 Jessie Berlin <jberlin at apple.com>
+
+ Windows build fix. Unreviewed.
+
+ * UIProcess/API/win/WKAPICastWin.h:
+ (toWK):
+ * UIProcess/API/win/WKBaseWin.h:
+
2010-09-01 Jia Pu <jpu at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebKit2/UIProcess/API/win/WKAPICastWin.h b/WebKit2/UIProcess/API/win/WKAPICastWin.h
index a539745..34fc253 100644
--- a/WebKit2/UIProcess/API/win/WKAPICastWin.h
+++ b/WebKit2/UIProcess/API/win/WKAPICastWin.h
@@ -36,7 +36,7 @@ namespace WebKit {
inline WebKit::WebView* toWK(WKViewRef v)
{
- return reinterpret_cast<WebKit::WebView*>(v);
+ return reinterpret_cast<WebKit::WebView*>(const_cast<OpaqueWKView*>(v));
}
inline WKViewRef toRef(WebKit::WebView* v)
diff --git a/WebKit2/UIProcess/API/win/WKBaseWin.h b/WebKit2/UIProcess/API/win/WKBaseWin.h
index 3d7748e..e2ee9a7 100644
--- a/WebKit2/UIProcess/API/win/WKBaseWin.h
+++ b/WebKit2/UIProcess/API/win/WKBaseWin.h
@@ -30,6 +30,6 @@
#error "Please #include \"WKBase.h\" instead of this file directly."
#endif
-typedef struct OpaqueWKView* WKViewRef;
+typedef const struct OpaqueWKView* WKViewRef;
#endif /* WKBaseWin_h */
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list