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

[ddkilzer at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 10844aafc726100daa16b4196eeb07482f73932d
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 21 16:38:35 2010 +0000

    <http://webkit.org/b/48051> Move macros from DumpRenderTreeMac.h to config.h
    
    Reviewed by Adam Roben.
    
    * DumpRenderTree/config.h: Moved macros to here...
    * DumpRenderTree/mac/DumpRenderTreeMac.h: ...from here.
    Addresses a FIXME comment from r28419.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70241 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7548089..cd9e458 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,15 @@
 2010-10-21  David Kilzer  <ddkilzer at apple.com>
 
+        <http://webkit.org/b/48051> Move macros from DumpRenderTreeMac.h to config.h
+
+        Reviewed by Adam Roben.
+
+        * DumpRenderTree/config.h: Moved macros to here...
+        * DumpRenderTree/mac/DumpRenderTreeMac.h: ...from here.
+        Addresses a FIXME comment from r28419.
+
+2010-10-21  David Kilzer  <ddkilzer at apple.com>
+
         <http://webkit.org/b/48047> Fix warnings found by check-Xcode-source-file-types
 
         Reviewed by Adam Roben.
diff --git a/WebKitTools/DumpRenderTree/config.h b/WebKitTools/DumpRenderTree/config.h
index 33dee6d..55e2dc1 100644
--- a/WebKitTools/DumpRenderTree/config.h
+++ b/WebKitTools/DumpRenderTree/config.h
@@ -40,6 +40,18 @@
 #define WEBKIT_EXPORTDATA
 #endif
 
+#if PLATFORM(MAC)
+#define WTF_PLATFORM_CF 1
+
+#if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+#define BUILDING_ON_TIGER 1
+#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
+#define BUILDING_ON_LEOPARD 1
+#elif !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
+#define BUILDING_ON_SNOW_LEOPARD 1
+#endif
+#endif // PLATFORM(MAC)
+
 #if PLATFORM(WIN)
 #define WTF_PLATFORM_CF 1 
 #if defined(WIN_CAIRO)
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h b/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h
index 2a2279e..36c5eac 100644
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h
@@ -31,17 +31,6 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
-// FIXME: we should add a config.h file for DumpRenderTree.
-#define WTF_PLATFORM_CF 1
-
-#if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-#define BUILDING_ON_TIGER 1
-#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
-#define BUILDING_ON_LEOPARD 1
-#elif !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
-#define BUILDING_ON_SNOW_LEOPARD 1
-#endif
-
 #ifdef __OBJC__
 @class DumpRenderTreeDraggingInfo;
 @class NavigationController;

-- 
WebKit Debian packaging