2009-06-12 Brent Fulgham <bfulgham@webkit.org>
authorbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Jun 2009 21:36:08 +0000 (21:36 +0000)
committerbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Jun 2009 21:36:08 +0000 (21:36 +0000)
        Unreviewed build correction.

        Revert accidental configuration checkin.  Was not meant to
        be part of the last changeset.

        * config.h:

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

WebCore/ChangeLog
WebCore/config.h

index 9349685..7bca486 100644 (file)
@@ -1,5 +1,14 @@
 2009-06-12  Brent Fulgham  <bfulgham@webkit.org>
 
+        Unreviewed build correction.
+
+        Revert accidental configuration checkin.  Was not meant to
+        be part of the last changeset.
+
+        * config.h:
+
+2009-06-12  Brent Fulgham  <bfulgham@webkit.org>
+
         Reviewed by Eric Seidel.
 
         https://bugs.webkit.org/show_bug.cgi?id=26353
index af675aa..9714643 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <wtf/Platform.h>
 
-#if PLATFORM(WIN_OS) && !defined(BUILDING_WX__)
+#if PLATFORM(WIN_OS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
 #define JS_EXPORTDATA __declspec(dllexport)
 #else
 #endif
 
 // CURL needs winsock, so don't prevent inclusion of it
-//#if !USE(CURL)
+#if !USE(CURL)
 #ifndef _WINSOCKAPI_
 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
 #endif
-//#endif
+#endif
 
 #endif /* PLATFORM(WIN_OS) */
 
 #endif
 
 #if PLATFORM(WIN)
-#define WTF_PLATFORM_CF 1
-#if 0
 #define WTF_PLATFORM_CG 1
 #undef WTF_PLATFORM_CAIRO
 #define WTF_USE_CFNETWORK 1
-#undef WTF_USE_CURL
-#else
-#undef WTF_PLATFORM_CG
-#define WTF_PLATFORM_CAIRO 1
-#undef WTF_USE_CFNETWORK
-#define WTF_USE_CURL 1
-#endif
-#undef WTF_USE_PTHREADS
 #undef WTF_USE_WININET
+#define WTF_PLATFORM_CF 1
+#define WTF_USE_PTHREADS 0
 #endif
 
 #if PLATFORM(MAC)