Title: [138305] trunk/Tools
- Revision
- 138305
- Author
- ander...@apple.com
- Date
- 2012-12-20 15:06:46 -0800 (Thu, 20 Dec 2012)
Log Message
Don't include WebKit2 headers when building TestWebKitAPI on windows
https://bugs.webkit.org/show_bug.cgi?id=105582
Reviewed by Tim Horton.
* TestWebKitAPI/config.h:
* TestWebKitAPI/win/main.cpp:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (138304 => 138305)
--- trunk/Tools/ChangeLog 2012-12-20 22:50:57 UTC (rev 138304)
+++ trunk/Tools/ChangeLog 2012-12-20 23:06:46 UTC (rev 138305)
@@ -1,3 +1,13 @@
+2012-12-20 Anders Carlsson <ander...@apple.com>
+
+ Don't include WebKit2 headers when building TestWebKitAPI on windows
+ https://bugs.webkit.org/show_bug.cgi?id=105582
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/config.h:
+ * TestWebKitAPI/win/main.cpp:
+
2012-12-20 Ryosuke Niwa <rn...@webkit.org>
REGRESSION(r133820?): SimplifyMarkupTest API test asserts
Modified: trunk/Tools/TestWebKitAPI/config.h (138304 => 138305)
--- trunk/Tools/TestWebKitAPI/config.h 2012-12-20 22:50:57 UTC (rev 138304)
+++ trunk/Tools/TestWebKitAPI/config.h 2012-12-20 23:06:46 UTC (rev 138305)
@@ -64,7 +64,7 @@
#include <stdint.h>
-#if !PLATFORM(CHROMIUM) || (PLATFORM(GTK) && defined(BUILDING_WEBKIT2__))
+#if (!PLATFORM(CHROMIUM) && !PLATFORM(WIN)) || (PLATFORM(GTK) && defined(BUILDING_WEBKIT2__))
#include <WebKit2/WebKit2_C.h>
#endif
Modified: trunk/Tools/TestWebKitAPI/win/main.cpp (138304 => 138305)
--- trunk/Tools/TestWebKitAPI/win/main.cpp 2012-12-20 22:50:57 UTC (rev 138304)
+++ trunk/Tools/TestWebKitAPI/win/main.cpp 2012-12-20 23:06:46 UTC (rev 138305)
@@ -25,6 +25,7 @@
#include "config.h"
#include "TestsController.h"
+#include <windows.h>
int main(int argc, char** argv)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
