[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:28 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ac5d46299b99875d173ec99cd6d2586e28e15c05
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 20 03:14:24 2010 +0000
Build fix.
* WebCorePrefix.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63711 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2cad9db..4b029ee 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
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 017a483..aade602 100644
--- a/WebCore/WebCorePrefix.h
+++ b/WebCore/WebCorePrefix.h
@@ -135,10 +135,7 @@
#else
#if defined(WIN32) || defined(_WIN32)
-// 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/ColorSyncPriv.h>
-#ifdef COLORSYNC_CORE_SERVICES_H_
+#include <CoreServices/CoreServices.h>
#define COREGRAPHICS_INCLUDES_CORESERVICES_HEADER
#define OBSOLETE_COLORSYNC_API
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list