[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[ddkilzer at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 55ab7236efa6e833bace6d3b89b6c5ab1bba6dd8
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 23 22:03:05 2009 +0000

            Move definition of USE(PLUGIN_HOST_PROCESS) from WebKitPrefix.h to Platform.h
    
            Reviewed by Mark Rowe.
    
    JavaScriptCore:
    
            * wtf/Platform.h: Define WTF_USE_PLUGIN_HOST_PROCESS to 1 when
            building on 64-bit SnowLeopard.  Define to 0 elsewhere.
    
    WebKit/mac:
    
            * WebKitPrefix.h: Removed definition of
            WTF_USE_PLUGIN_HOST_PROCESS.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48685 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 4cf27bc..2b2fe18 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-23  David Kilzer  <ddkilzer at apple.com>
+
+        Move definition of USE(PLUGIN_HOST_PROCESS) from WebKitPrefix.h to Platform.h
+
+        Reviewed by Mark Rowe.
+
+        * wtf/Platform.h: Define WTF_USE_PLUGIN_HOST_PROCESS to 1 when
+        building on 64-bit SnowLeopard.  Define to 0 elsewhere.
+
 2009-09-22  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 7ddfc95..ffef0f1 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -407,6 +407,9 @@
 #if PLATFORM(MAC) && !PLATFORM(IPHONE)
 #define WTF_PLATFORM_CF 1
 #define WTF_USE_PTHREADS 1
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_TIGER) && defined(__x86_64__)
+#define WTF_USE_PLUGIN_HOST_PROCESS 1
+#endif
 #if !defined(ENABLE_MAC_JAVA_BRIDGE)
 #define ENABLE_MAC_JAVA_BRIDGE 1
 #endif
@@ -415,7 +418,7 @@
 #endif
 #define HAVE_READLINE 1
 #define HAVE_RUNLOOP_TIMER 1
-#endif
+#endif // PLATFORM(MAC) && !PLATFORM(IPHONE)
 
 #if PLATFORM(CHROMIUM) && PLATFORM(DARWIN)
 #define WTF_PLATFORM_CF 1
@@ -595,6 +598,10 @@
 #define ENABLE_NETSCAPE_PLUGIN_API 1
 #endif
 
+#if !defined(WTF_USE_PLUGIN_HOST_PROCESS)
+#define WTF_USE_PLUGIN_HOST_PROCESS 0
+#endif
+
 #if !defined(ENABLE_ORIENTATION_EVENTS)
 #define ENABLE_ORIENTATION_EVENTS 0
 #endif
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 8b4d539..4fb5626 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-23  David Kilzer  <ddkilzer at apple.com>
+
+        Move definition of USE(PLUGIN_HOST_PROCESS) from WebKitPrefix.h to Platform.h
+
+        Reviewed by Mark Rowe.
+
+        * WebKitPrefix.h: Removed definition of
+        WTF_USE_PLUGIN_HOST_PROCESS.
+
 2009-09-22  Timothy Hatcher  <timothy at apple.com>
 
         Prevent scrolling multiple frames during latched wheel events.
diff --git a/WebKit/mac/WebKitPrefix.h b/WebKit/mac/WebKitPrefix.h
index 0edec06..518fc1b 100644
--- a/WebKit/mac/WebKitPrefix.h
+++ b/WebKit/mac/WebKitPrefix.h
@@ -74,10 +74,6 @@ typedef float CGFloat;
 
 #include "EmptyProtocolDefinitions.h"
 
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_TIGER) && defined(__x86_64__)
-#define WTF_USE_PLUGIN_HOST_PROCESS 1
-#endif
-
 /* WebKit has no way to pull settings from WebCore/config.h for now */
 /* so we assume WebKit is always being compiled on top of JavaScriptCore */
 #define WTF_USE_JSC 1

-- 
WebKit Debian packaging