[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:37 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit bf6c820d6a23af7cae71ff60187e9fbb434c4592
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 04:32:03 2010 +0000

    (Hopefully the last) Windows build fix.
    
    Version of CoreServices.h in WebKit Support Libraries uses
    pragma once, unlike the version I have locally. Switch based
    on __COLORSYNCDEPRECATED__ instead.
    
    * WebCorePrefix.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63717 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9850dea..04c9f53 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2010-07-19  Steve Falkenburg  <sfalken at apple.com>
 
+        (Hopefully the last) Windows build fix.
+        
+        Version of CoreServices.h in WebKit Support Libraries uses
+        pragma once, unlike the version I have locally. Switch based
+        on __COLORSYNCDEPRECATED__ instead.
+
+        * WebCorePrefix.h:
+
+2010-07-19  Steve Falkenburg  <sfalken at apple.com>
+
         Windows build fix.
 
         * WebCorePrefix.h:
diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h
index 435e266..cde5a85 100644
--- a/WebCore/WebCorePrefix.h
+++ b/WebCore/WebCorePrefix.h
@@ -138,7 +138,7 @@
 // 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_
+#ifdef __COLORSYNCDEPRECATED__
 #define COREGRAPHICS_INCLUDES_CORESERVICES_HEADER
 #define OBSOLETE_COLORSYNC_API
 #endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list