Rubber stamped by Mark Rowe.

        Define CF as platform for mac and revert r28409

        * DumpRenderTree/DumpRenderTree.h:
        * DumpRenderTree/mac/DumpRenderTreeMac.h:

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ca860cc6d38cffebc98b8f77900602dd55fd24e3..ddaf0ed298eb6224c93f4fdfb1392de9eac283ff 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-04  Sam Weinig  <sam@webkit.org>
+
+        Rubber stamped by Mark Rowe.
+
+        Define CF as platform for mac and revert r28409
+
+        * DumpRenderTree/DumpRenderTree.h:
+        * DumpRenderTree/mac/DumpRenderTreeMac.h:
+

 2007-12-04  Sam Weinig  <sam@webkit.org>
 
         Define CF as platform for windows.
 2007-12-04  Sam Weinig  <sam@webkit.org>
 
         Define CF as platform for windows.

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.h b/WebKitTools/DumpRenderTree/DumpRenderTree.h
index a27d8823e1ae2e24a8dc2b274fdaba332e8c51ab..174da27380eceb4bf11cb007636644604d049b72 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.h
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.h
@@ -39,7 +39,7 @@
 #include "DumpRenderTreeGtk.h"
 #endif
 
 #include "DumpRenderTreeGtk.h"
 #endif
 

-#if PLATFORM(CF) || PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(CF)

 #include <CoreFoundation/CoreFoundation.h>
 extern CFRunLoopTimerRef waitToDumpWatchdog;
 #endif
 #include <CoreFoundation/CoreFoundation.h>
 extern CFRunLoopTimerRef waitToDumpWatchdog;
 #endif

diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h b/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h
index fff124b1105398274c4b759f9d0b8be64b6e6467..fcfe14d81ab1615a865a0f9c92ff33292eb7b1db 100644 (file)
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h
@@ -29,6 +29,9 @@
 #ifndef DumpRenderTreeMac_h
 #define DumpRenderTreeMac_h
 
 #ifndef DumpRenderTreeMac_h
 #define DumpRenderTreeMac_h
 

+// FIXME: we should add a config.h file for DumpRenderTree.
+#define WTF_PLATFORM_CF 1
+

 @class DumpRenderTreeDraggingInfo;
 @class NavigationController;
 @class PolicyDelegate;
 @class DumpRenderTreeDraggingInfo;
 @class NavigationController;
 @class PolicyDelegate;