[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 1388c731b36ebbf91cbaec4f73d15882aab0f603
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 20:36:30 2009 +0000

            Windows build fix.
    
            * platform/network/cf/SocketStreamHandleCFNet.cpp: Don't try to include a file that's not
            in WebKitSupportLibrary.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51045 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1547408..3a8d8a3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2009-11-16  Alexey Proskuryakov  <ap at apple.com>
 
+        Windows build fix.
+
+        * platform/network/cf/SocketStreamHandleCFNet.cpp: Don't try to include a file that's not
+        in WebKitSupportLibrary.
+
+2009-11-16  Alexey Proskuryakov  <ap at apple.com>
+
         Reviewed by Darin Adler.
 
         https://bugs.webkit.org/show_bug.cgi?id=31494
diff --git a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
index 41c77d4..4fcf06a 100644
--- a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
+++ b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
@@ -40,13 +40,9 @@
 #include <SystemConfiguration/SystemConfiguration.h>
 #endif
 
-#if PLATFORM(WIN)
-#include <CFNetwork/CFSocketStreamPriv.h>
-#else
 extern const CFStringRef kCFStreamPropertyCONNECTProxy;
 extern const CFStringRef kCFStreamPropertyCONNECTProxyHost;
 extern const CFStringRef kCFStreamPropertyCONNECTProxyPort;
-#endif
 
 namespace WebCore {
 

-- 
WebKit Debian packaging