[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 f078614536bae447fa00638970461f212df5107e
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 23:57:47 2009 +0000

            Tiger build fix.
    
            * platform/network/cf/SocketStreamHandleCFNet.cpp: Define CFN_EXPORT, as this macro was named
            differently in Tiger CFNetwork.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b2057fb..348dbfe 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-16  Alexey Proskuryakov  <ap at apple.com>
+
+        Tiger build fix.
+
+        * platform/network/cf/SocketStreamHandleCFNet.cpp: Define CFN_EXPORT, as this macro was named
+        differently in Tiger CFNetwork.
+
 2009-11-16  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
index 6aa8adc..c3b2076 100644
--- a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
+++ b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
@@ -40,6 +40,10 @@
 #include <SystemConfiguration/SystemConfiguration.h>
 #endif
 
+#if BUILDING_ON_TIGER
+#define CFN_EXPORT export
+#endif
+
 extern "C" {
 CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxy;
 CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxyHost;

-- 
WebKit Debian packaging