[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 2c99a35cf822036de09ba581445b236ba8d8625a
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 21:28:26 2009 +0000

            Windows build fix.
    
            * platform/network/cf/SocketStreamHandleCFNet.cpp: Declare constants as extern "C".
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51048 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f78387c..60c868a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-16  Alexey Proskuryakov  <ap at apple.com>
+
+        Windows build fix.
+
+        * platform/network/cf/SocketStreamHandleCFNet.cpp: Declare constants as extern "C".
+
 2009-11-15  Brent Fulgham  <bfulgham at webkit.org>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
index 4fcf06a..2843cbf 100644
--- a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
+++ b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
@@ -40,9 +40,11 @@
 #include <SystemConfiguration/SystemConfiguration.h>
 #endif
 
+extern "C" {
 extern const CFStringRef kCFStreamPropertyCONNECTProxy;
 extern const CFStringRef kCFStreamPropertyCONNECTProxyHost;
 extern const CFStringRef kCFStreamPropertyCONNECTProxyPort;
+}
 
 namespace WebCore {
 

-- 
WebKit Debian packaging