[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:35 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 96e251a1b126013e8d74f1226810538f76d70fbf
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 20 04:17:53 2010 +0000
Windows build fix.
* WebCorePrefix.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63716 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b6b013b..9850dea 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
2010-07-19 Steve Falkenburg <sfalken at apple.com>
+ Windows build fix.
+
+ * WebCorePrefix.h:
+
+2010-07-19 Steve Falkenburg <sfalken at apple.com>
+
Build fix.
* WebCorePrefix.h:
diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h
index e5f8f7b..435e266 100644
--- a/WebCore/WebCorePrefix.h
+++ b/WebCore/WebCorePrefix.h
@@ -135,9 +135,13 @@
#else
#if defined(WIN32) || defined(_WIN32)
-#include <CoreServices/CoreServices.h>
+// FIXME <rdar://problem/8208868> Remove support for obsolete ColorSync API, CoreServices header in CoreGraphics
+// We can remove this once the new ColorSync APIs are available in an internal Safari SDK.
+#include <ColorSync/ColorSync.h>
+#ifdef COLORSYNC_CORE_SERVICES_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