[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
sfalken at apple.com
sfalken at apple.com
Wed Dec 22 11:20:29 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8bdabe21f668b0ee235f127d8af27d1e652ab1ce
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 20 03:24:34 2010 +0000
Build fix.
* WebCorePrefix.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63712 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4b029ee..b6b013b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -6,6 +6,12 @@
2010-07-19 Steve Falkenburg <sfalken at apple.com>
+ Build fix.
+
+ * WebCorePrefix.h:
+
+2010-07-19 Steve Falkenburg <sfalken at apple.com>
+
Windows Build fixes for new ColorSync API.
We support both new and old APIs, since the newer headers aren't in the tree yet.
diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h
index aade602..e5f8f7b 100644
--- a/WebCore/WebCorePrefix.h
+++ b/WebCore/WebCorePrefix.h
@@ -138,7 +138,6 @@
#include <CoreServices/CoreServices.h>
#define COREGRAPHICS_INCLUDES_CORESERVICES_HEADER
#define OBSOLETE_COLORSYNC_API
-#endif
/* Windows doesn't include CFNetwork.h via CoreServices.h, so we do
it explicitly here to make Windows more consistent with Mac. */
#include <CFNetwork/CFNetwork.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list