[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

bfulgham at webkit.org bfulgham at webkit.org
Wed Dec 22 11:15:08 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 31f0653660fb870411ea8fea1f27a722c8931e6e
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 00:00:13 2010 +0000

    Build fix.  Don't include CoreGraphics.h on non-CG builds.
    
    * WebKit2Prefix.h: Conditionalize include of CoreGraphics.h
    to avoid build break on WinCairo.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63496 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d91145f..51f3f64 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-15  Brent Fulgham  <bfulgham at webkit.org>
+
+        Build fix.  Don't include CoreGraphics.h on non-CG builds.
+
+        * WebKit2Prefix.h: Conditionalize include of CoreGraphics.h
+        to avoid build break on WinCairo.
+
 2010-07-15  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/WebKit2Prefix.h b/WebKit2/WebKit2Prefix.h
index 7503320..18d86e4 100644
--- a/WebKit2/WebKit2Prefix.h
+++ b/WebKit2/WebKit2Prefix.h
@@ -76,6 +76,9 @@
 
 #include <WebCore/config.h>
 #include <windows.h>
+
+#if PLATFORM(CG)
 #include <CoreGraphics/CoreGraphics.h>
+#endif
 
 #endif /* defined(WIN32) || defined(_WIN32) */

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list