Fix windows build.
authoradachan@apple.com <adachan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Oct 2008 22:16:30 +0000 (22:16 +0000)
committeradachan@apple.com <adachan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Oct 2008 22:16:30 +0000 (22:16 +0000)
        Reviewed by Sam Weinig.

        * DumpRenderTree/cg/PixelDumpSupportCG.cpp:
        * DumpRenderTree/config.h:
        * DumpRenderTree/win/DumpRenderTreeWin.h:
        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
        * DumpRenderTree/win/UIDelegate.cpp:

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

WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/cg/PixelDumpSupportCG.cpp
WebKitTools/DumpRenderTree/config.h
WebKitTools/DumpRenderTree/win/DumpRenderTreeWin.h
WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
WebKitTools/DumpRenderTree/win/UIDelegate.cpp

index cc0b4ad..fbf1ce3 100644 (file)
@@ -1,3 +1,15 @@
+2008-10-14  Ada Chan  <adachan@apple.com>
+
+        Fix windows build.
+
+        Reviewed by Sam Weinig.
+
+        * DumpRenderTree/cg/PixelDumpSupportCG.cpp:
+        * DumpRenderTree/config.h:
+        * DumpRenderTree/win/DumpRenderTreeWin.h:
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+        * DumpRenderTree/win/UIDelegate.cpp:
+
 2008-10-13  Timothy Hatcher  <timothy@apple.com>
 
         Make prepare-ChangeLog populate the changed functions for JavaScript files.
index 5e9d3b6..260a94e 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "PixelDumpSupportCG.h"
 
+#include "DumpRenderTree.h"
 #include "LayoutTestController.h"
 #include <ImageIO/CGImageDestination.h>
 #include <wtf/Assertions.h>
index 366df55..4775ae2 100644 (file)
 #endif
 
 #include <wtf/Platform.h>
+
+#if PLATFORM(WIN)
+#define WTF_PLATFORM_CF 1 
+
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+
+#undef WINVER
+#define WINVER 0x0500
+
+// If we don't define these, they get defined in windef.h. 
+// We want to use std::min and std::max
+#undef max
+#define max max
+#undef min
+#define min min
+
+#undef _WINSOCKAPI_
+#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
+#endif  // PLATFORM(WIN)
index 1e19920..45ce0dc 100644 (file)
 #ifndef DumpRenderTreeWin_h
 #define DumpRenderTreeWin_h
 
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
-
-#undef WINVER
-#define WINVER 0x0500
-
-// If we don't define these, they get defined in windef.h. 
-// We want to use std::min and std::max
-#undef max
-#define max max
-#undef min
-#define min min
-
-#undef _WINSOCKAPI_
-#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
-
 struct IWebFrame;
 struct IWebPolicyDelegate;
 struct IWebView;
index c681ce2..62e4307 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "LayoutTestController.h"
 
+#include "DumpRenderTree.h"
 #include "EditingDelegate.h"
 #include "PolicyDelegate.h"
 #include "WorkQueue.h"
index 5be9551..a2532a5 100755 (executable)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "UIDelegate.h"
 
+#include "DumpRenderTree.h"
 #include "DraggingInfo.h"
 #include "EventSender.h"
 #include "LayoutTestController.h"