[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

bweinstein at apple.com bweinstein at apple.com
Fri Jan 21 14:53:58 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit eb6f96ae9bc327a495f992267c789ae62a6e3000
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 00:39:13 2011 +0000

    Windows build fix. Define WTF_USE_CFNETWORK in WebInspectorClientCF.
    
    * WebCoreSupport/WebInspectorClientCF.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74948 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/cf/ChangeLog b/WebKit/cf/ChangeLog
index 1efdd4d..78b82a3 100644
--- a/WebKit/cf/ChangeLog
+++ b/WebKit/cf/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-03  Brian Weinstein  <bweinstein at apple.com>
+
+        Windows build fix. Define WTF_USE_CFNETWORK in WebInspectorClientCF.
+
+        * WebCoreSupport/WebInspectorClientCF.cpp:
+
 2010-10-18  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
index 62fdd4d..3a95545 100644
--- a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
+++ b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
@@ -27,12 +27,16 @@
 // before including any other files. Failing to include config.h will leave
 // WTF_PLATFORM_CF and WTF_USE_JSC undefined, causing build failures in this 
 // file. But Mac doesn't have a config.h for WebKit, so we can't include the 
-// Windows one here. For now we can just define WTF_PLATFORM_CF and WTF_USE_JSC
-// manually, but we need a better long-term solution.
+// Windows one here. For now we can just define WTF_PLATFORM_CF,  WTF_USE_JSC, and
+// WTF_USE_CFNETWORK manually, but we need a better long-term solution.
 #ifndef WTF_PLATFORM_CF
 #define WTF_PLATFORM_CF 1
 #endif
 
+#ifndef WTF_USE_CFNETWORK
+#define WTF_USE_CFNETWORK 1
+#endif
+
 #ifndef WTF_USE_JSC
 #define WTF_USE_JSC 1
 #endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list