Title: [94916] trunk
- Revision
- 94916
- Author
- [email protected]
- Date
- 2011-09-10 17:52:14 -0700 (Sat, 10 Sep 2011)
Log Message
[wx] Unreviewed build fix. MSW build fixes.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (94915 => 94916)
--- trunk/Source/WebCore/ChangeLog 2011-09-11 00:17:04 UTC (rev 94915)
+++ trunk/Source/WebCore/ChangeLog 2011-09-11 00:52:14 UTC (rev 94916)
@@ -1,3 +1,9 @@
+2011-09-10 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix. MSW build fixes.
+
+ * config.h:
+
2011-09-09 David Hyatt <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=67861
Modified: trunk/Source/WebCore/config.h (94915 => 94916)
--- trunk/Source/WebCore/config.h 2011-09-11 00:17:04 UTC (rev 94915)
+++ trunk/Source/WebCore/config.h 2011-09-11 00:52:14 UTC (rev 94916)
@@ -29,7 +29,7 @@
#include <wtf/Platform.h>
-#if OS(WINDOWS) && !OS(WINCE) && !PLATFORM(QT) && !PLATFORM(CHROMIUM) && !PLATFORM(GTK)
+#if OS(WINDOWS) && !OS(WINCE) && !PLATFORM(QT) && !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(WX)
#include <WebCore/WebCoreHeaderDetection.h>
#endif
Modified: trunk/Tools/ChangeLog (94915 => 94916)
--- trunk/Tools/ChangeLog 2011-09-11 00:17:04 UTC (rev 94915)
+++ trunk/Tools/ChangeLog 2011-09-11 00:52:14 UTC (rev 94916)
@@ -1,3 +1,10 @@
+2011-09-10 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix. MSW build fixes.
+
+ * DumpRenderTree/config.h:
+ * waf/build/wxpresets.py:
+
2011-09-10 Andreas Kling <[email protected]>
Crash beneath WKURLIsEqual() when reloading in MiniBrowser.
Modified: trunk/Tools/DumpRenderTree/config.h (94915 => 94916)
--- trunk/Tools/DumpRenderTree/config.h 2011-09-11 00:17:04 UTC (rev 94915)
+++ trunk/Tools/DumpRenderTree/config.h 2011-09-11 00:52:14 UTC (rev 94916)
@@ -53,6 +53,13 @@
#endif /* USE(EXPORT_MACROS) */
+// On MSW, wx headers need to be included before windows.h is.
+// The only way we can always ensure this is if we include wx here.
+#if PLATFORM(WX)
+#include <wx/defs.h>
+#endif
+
+
#ifdef __cplusplus
#undef new
#undef delete
@@ -69,6 +76,15 @@
#endif
#endif // PLATFORM(MAC)
+#if OS(WINDOWS)
+// 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
+#endif
+
#if PLATFORM(WIN)
#define WTF_USE_CF 1
#if PLATFORM(WIN_CAIRO)
@@ -85,13 +101,6 @@
#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)
Modified: trunk/Tools/waf/build/wxpresets.py (94915 => 94916)
--- trunk/Tools/waf/build/wxpresets.py 2011-09-11 00:17:04 UTC (rev 94915)
+++ trunk/Tools/waf/build/wxpresets.py 2011-09-11 00:52:14 UTC (rev 94916)
@@ -25,6 +25,7 @@
import os
import re
+import sys
import Options
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
