2011-02-15 Pratik Solanki <psolanki@apple.com>
authorpsolanki@apple.com <psolanki@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Feb 2011 23:01:10 +0000 (23:01 +0000)
committerpsolanki@apple.com <psolanki@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Feb 2011 23:01:10 +0000 (23:01 +0000)
        Move WTF_USE_CFNETWORK to Platform.h
        https://bugs.webkit.org/show_bug.cgi?id=54168

        Reviewed by Darin Adler.

        * wtf/Platform.h: Define WTF_USE_CFNETWORK for Windows builds.
2011-02-15  Pratik Solanki  <psolanki@apple.com>

        Move WTF_USE_CFNETWORK to Platform.h
        https://bugs.webkit.org/show_bug.cgi?id=54168

        Reviewed by Darin Adler.

        * config.h: Remove WTF_USE_CFNETWORK.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@78622 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/wtf/Platform.h
Source/WebCore/ChangeLog
Source/WebCore/config.h

index 0b36070..ca9287c 100644 (file)
@@ -1,3 +1,12 @@
+2011-02-15  Pratik Solanki  <psolanki@apple.com>
+
+        Move WTF_USE_CFNETWORK to Platform.h
+        https://bugs.webkit.org/show_bug.cgi?id=54168
+
+        Reviewed by Darin Adler.
+
+        * wtf/Platform.h: Define WTF_USE_CFNETWORK for Windows builds.
+
 2011-02-15  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Darin Adler.
index 193b76d..7d146dd 100644 (file)
 #define WTF_USE_PTHREADS 0
 #endif
 
+#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(CHROMIUM) && !defined(WIN_CAIRO)
+#define WTF_USE_CFNETWORK 1
+#endif
+
 #if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(CHROMIUM) && !PLATFORM(QT)
 #define ENABLE_WEB_ARCHIVE 1
 #endif
index 34f8311..fa36d1e 100644 (file)
@@ -1,3 +1,12 @@
+2011-02-15  Pratik Solanki  <psolanki@apple.com>
+
+        Move WTF_USE_CFNETWORK to Platform.h
+        https://bugs.webkit.org/show_bug.cgi?id=54168
+
+        Reviewed by Darin Adler.
+
+        * config.h: Remove WTF_USE_CFNETWORK.
+
 2011-02-15  Kenneth Russell  <kbr@google.com>
 
         Reviewed by Darin Fisher.
index a3c0e50..972d5e1 100644 (file)
 #if defined(WIN_CAIRO)
 #undef WTF_PLATFORM_CG
 #define WTF_PLATFORM_CAIRO 1
-#undef WTF_USE_CFNETWORK
 #define WTF_USE_CURL 1
 #ifndef _WINSOCKAPI_
 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
 #elif !OS(WINCE)
 #define WTF_PLATFORM_CG 1
 #undef WTF_PLATFORM_CAIRO
-#define WTF_USE_CFNETWORK 1
 #undef WTF_USE_CURL
 #endif
 #endif
 #define WTF_USE_V8 1
 #endif
 
-#undef WTF_USE_CFNETWORK
-
 #endif /* PLATFORM(CHROMIUM) */
 
 #if !defined(WTF_USE_V8)