[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[mrowe at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 7bec3d4f5bba6113b4a2f07ef17eba3b2aaa1bbf
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 03:02:52 2010 +0000

    Windows build fix.
    
    * WebKitPrefix.h: Include CoreFoundation/CoreFoundation.h from the Windows prefix header
    since some WebCore headers rely on the types declared within being available via the prefix
    header.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55652 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index ab4a28b..36a8987 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-07  Mark Rowe  <mrowe at apple.com>
+
+        Windows build fix.
+
+        * WebKitPrefix.h: Include CoreFoundation/CoreFoundation.h from the Windows prefix header
+        since some WebCore headers rely on the types declared within being available via the prefix
+        header.
+
 2010-03-05  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit/win/WebKitPrefix.h b/WebKit/win/WebKitPrefix.h
index 13cf8e0..9b2fc85 100644
--- a/WebKit/win/WebKitPrefix.h
+++ b/WebKit/win/WebKitPrefix.h
@@ -47,4 +47,5 @@
 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
 #endif
 
+#include <CoreFoundation/CoreFoundation.h>
 #include <WebKit/WebKit.h>

-- 
WebKit Debian packaging