[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ggaren at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 321be599619765f6f81cf7e9d0e4e288c372b2bb
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 22:04:23 2010 +0000

    2010-08-03  Alex Milowski  <alex at milowski.com>
    
            Reviewed by Beth Dakin.
    
            Changed the ENABLE_MATHML value to enable MathML by default.
    
            * Configurations/FeatureDefines.xcconfig:
    2010-08-03  Geoffrey Garen  <ggaren at apple.com>
    
            Reviewed by Mark Rowe.
    
            https://bugs.webkit.org/show_bug.cgi?id=43444
            PLATFORM(CF) is false on Windows in JavaScriptCore
    
            Moved some PLATFORM(WIN) #defines down into JavaScriptCore.
    
            * config.h: Moved WTF_PLATFORM_CF 1 and WTF_USE_PTHREADS 0 to wtf/Platform.h.
            Removed #undef WTF_USE_WININET because wtf/Platform.h no longer #defines it.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f60804f..291584f 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -28,6 +28,19 @@
 
 2010-08-03  Geoffrey Garen  <ggaren at apple.com>
 
+        Reviewed by Mark Rowe.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43444
+        PLATFORM(CF) is false on Windows in JavaScriptCore
+
+        Moved some PLATFORM(WIN) #defines down into JavaScriptCore.
+
+        * wtf/Platform.h: Added WTF_PLATFORM_CF 1 and WTF_USE_PTHREADS 0, inherited
+        from WebCore/config.h. Removed WTF_USE_WININET 1 since WebCore/config.h
+        just #undefined that later.
+
+2010-08-03  Geoffrey Garen  <ggaren at apple.com>
+
         Try to fix Windows build: Don't use GCActivityCallbackCF on Windows, since
         PLATFORM(CF) is not defined on Windows.
         
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 51bf92d..6fe4eeb 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -648,7 +648,8 @@
 #endif
 
 #if PLATFORM(WIN)
-#define WTF_USE_WININET 1
+#define WTF_PLATFORM_CF 1
+#define WTF_USE_PTHREADS 0
 #endif
 
 #if PLATFORM(WX)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 869ac5c..bba2500 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-03  Geoffrey Garen  <ggaren at apple.com>
+
+        Reviewed by Mark Rowe.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43444
+        PLATFORM(CF) is false on Windows in JavaScriptCore
+
+        Moved some PLATFORM(WIN) #defines down into JavaScriptCore.
+
+        * config.h: Moved WTF_PLATFORM_CF 1 and WTF_USE_PTHREADS 0 to wtf/Platform.h.
+        Removed #undef WTF_USE_WININET because wtf/Platform.h no longer #defines it.
+
 2010-08-03  Alex Milowski  <alex at milowski.com>
 
         Reviewed by Beth Dakin.
diff --git a/WebCore/config.h b/WebCore/config.h
index 9c7bc22..53b97d0 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -152,9 +152,6 @@
 #define WTF_USE_CFNETWORK 1
 #undef WTF_USE_CURL
 #endif
-#undef WTF_USE_WININET
-#define WTF_PLATFORM_CF 1
-#define WTF_USE_PTHREADS 0
 #endif
 
 #if PLATFORM(MAC)

-- 
WebKit Debian packaging