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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 380e945a3fcabb64b04f8829fbf57af8487c4a0a
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 23 00:18:47 2010 +0000

    2010-11-22  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Adam Roben.
    
            [WINCE] Set correct preprocessor definitions
            https://bugs.webkit.org/show_bug.cgi?id=49887
    
            * wtf/Platform.h:
    2010-11-22  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Adam Roben.
    
            [WINCE] Set correct preprocessor definitions
            https://bugs.webkit.org/show_bug.cgi?id=49887
    
            * config.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72572 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7a57414..13491de 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-22  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Adam Roben.
+
+        [WINCE] Set correct preprocessor definitions
+        https://bugs.webkit.org/show_bug.cgi?id=49887
+
+        * wtf/Platform.h:
+
 2010-11-22  Adam Roben  <aroben at apple.com>
 
         Use paths relative to $WebKitVSPropsRedirectionDir to access shared .vsprops files
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 772fdfb..12c3e3d 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -665,7 +665,7 @@
 #endif
 #endif
 
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) && !OS(WINCE)
 #define WTF_PLATFORM_CF 1
 #define WTF_USE_PTHREADS 0
 #endif
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8d39848..7acb656 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-22  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Adam Roben.
+
+        [WINCE] Set correct preprocessor definitions
+        https://bugs.webkit.org/show_bug.cgi?id=49887
+
+        * config.h:
+
 2010-11-22  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/config.h b/WebCore/config.h
index 943ef4a..404fa95 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -152,7 +152,7 @@
 #ifndef _WINSOCKAPI_
 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
 #endif
-#else
+#elif !OS(WINCE)
 #define WTF_PLATFORM_CG 1
 #undef WTF_PLATFORM_CAIRO
 #define WTF_USE_CFNETWORK 1

-- 
WebKit Debian packaging