[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
psolanki at apple.com
psolanki at apple.com
Fri Jan 21 14:54:00 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit f4a36c4f6eb273f30d9d4a430a84cd2f3271ab8f
Author: psolanki at apple.com <psolanki at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 4 00:54:46 2011 +0000
Mac build fix. Define WTF_USE_CFNETWORK for Windows build only.
* WebCoreSupport/WebInspectorClientCF.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74949 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/cf/ChangeLog b/WebKit/cf/ChangeLog
index 78b82a3..f712c97 100644
--- a/WebKit/cf/ChangeLog
+++ b/WebKit/cf/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-03 Pratik Solanki <psolanki at apple.com>
+
+ Mac build fix. Define WTF_USE_CFNETWORK for Windows build only.
+
+ * WebCoreSupport/WebInspectorClientCF.cpp:
+
2011-01-03 Brian Weinstein <bweinstein at apple.com>
Windows build fix. Define WTF_USE_CFNETWORK in WebInspectorClientCF.
diff --git a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
index 3a95545..9183fa4 100644
--- a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
+++ b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
@@ -33,15 +33,14 @@
#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
#if defined(WIN32) || defined(_WIN32)
+#ifndef WTF_USE_CFNETWORK
+#define WTF_USE_CFNETWORK 1
+#endif
#if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
#define JS_EXPORTDATA __declspec(dllexport)
#else
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list