[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
aroben at apple.com
aroben at apple.com
Thu Dec 3 13:35:52 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit ab2d06bf135843c5b9112c0e9b375b6becbd94cd
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 13 17:10:45 2009 +0000
Build fix
* Interfaces/WebKit.idl: Un-sort the #includes again. Apparently they
are order-dependent!
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50945 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 715236a..f25d0af 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,12 @@
2009-11-13 Adam Roben <aroben at apple.com>
+ Build fix
+
+ * Interfaces/WebKit.idl: Un-sort the #includes again. Apparently they
+ are order-dependent!
+
+2009-11-13 Adam Roben <aroben at apple.com>
+
Touch WebKit.idl to fix the Windows build
* Interfaces/WebKit.idl: Sorted #includes.
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index f7829bf..bbdbb2c 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -55,6 +55,8 @@ cpp_quote(" */")
import "oaidl.idl";
import "ocidl.idl";
+#include "WebScrollbarTypes.idl"
+#include "IWebScriptObject.idl"
#include "DOMCSS.idl"
#include "DOMCore.idl"
#include "DOMEvents.idl"
@@ -98,7 +100,6 @@ import "ocidl.idl";
#include "IWebInspectorPrivate.idl"
#include "IWebJavaScriptCollector.idl"
#include "IWebKitStatistics.idl"
-#include "IWebMutableURLRequest.idl"
#include "IWebMutableURLRequestPrivate.idl"
#include "IWebNavigationData.idl"
#include "IWebNotification.idl"
@@ -112,7 +113,6 @@ import "ocidl.idl";
#include "IWebResource.idl"
#include "IWebResourceLoadDelegate.idl"
#include "IWebResourceLoadDelegatePrivate.idl"
-#include "IWebScriptObject.idl"
#include "IWebScriptWorld.idl"
#include "IWebScrollBarDelegatePrivate.idl"
#include "IWebScrollBarPrivate.idl"
@@ -123,6 +123,7 @@ import "ocidl.idl";
#include "IWebUIDelegatePrivate.idl"
#include "IWebURLAuthenticationChallenge.idl"
#include "IWebURLRequest.idl"
+#include "IWebMutableURLRequest.idl"
#include "IWebURLResponse.idl"
#include "IWebURLResponsePrivate.idl"
#include "IWebUndoManager.idl"
@@ -130,7 +131,6 @@ import "ocidl.idl";
#include "IWebView.idl"
#include "IWebViewPrivate.idl"
#include "IWebWorkersPrivate.idl"
-#include "WebScrollbarTypes.idl"
#define __TYPELIB_VERSION__ __BUILD_NUMBER_MAJOR__##.##__BUILD_NUMBER_MINOR__
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list