Title: [123324] trunk
- Revision
- 123324
- Author
- [email protected]
- Date
- 2012-07-23 03:05:19 -0700 (Mon, 23 Jul 2012)
Log Message
[WINCE] Define NOMINMAX in the build system instead of Platform.h
https://bugs.webkit.org/show_bug.cgi?id=91938
Reviewed by Ryosuke Niwa.
.:
Define it in OptionsWindows.cmake, since NOMINMAX
should to be defined for all windows ports.
* Source/cmake/OptionsWinCE.cmake:
* Source/cmake/OptionsWindows.cmake:
Source/WTF:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/ChangeLog (123323 => 123324)
--- trunk/ChangeLog 2012-07-23 09:58:34 UTC (rev 123323)
+++ trunk/ChangeLog 2012-07-23 10:05:19 UTC (rev 123324)
@@ -1,3 +1,16 @@
+2012-07-23 Patrick Gansterer <[email protected]>
+
+ [WINCE] Define NOMINMAX in the build system instead of Platform.h
+ https://bugs.webkit.org/show_bug.cgi?id=91938
+
+ Reviewed by Ryosuke Niwa.
+
+ Define it in OptionsWindows.cmake, since NOMINMAX
+ should to be defined for all windows ports.
+
+ * Source/cmake/OptionsWinCE.cmake:
+ * Source/cmake/OptionsWindows.cmake:
+
2012-07-22 Sheriff Bot <[email protected]>
Unreviewed, rolling out r123298 and r123301.
Modified: trunk/Source/WTF/ChangeLog (123323 => 123324)
--- trunk/Source/WTF/ChangeLog 2012-07-23 09:58:34 UTC (rev 123323)
+++ trunk/Source/WTF/ChangeLog 2012-07-23 10:05:19 UTC (rev 123324)
@@ -1,5 +1,14 @@
2012-07-23 Patrick Gansterer <[email protected]>
+ [WINCE] Define NOMINMAX in the build system instead of Platform.h
+ https://bugs.webkit.org/show_bug.cgi?id=91938
+
+ Reviewed by Ryosuke Niwa.
+
+ * wtf/Platform.h:
+
+2012-07-23 Patrick Gansterer <[email protected]>
+
Build fix for Windows after r123317.
* wtf/DateMath.cpp: Added missing header include.
Modified: trunk/Source/WTF/wtf/Platform.h (123323 => 123324)
--- trunk/Source/WTF/wtf/Platform.h 2012-07-23 09:58:34 UTC (rev 123323)
+++ trunk/Source/WTF/wtf/Platform.h 2012-07-23 10:05:19 UTC (rev 123324)
@@ -502,7 +502,6 @@
#endif
#if OS(WINCE) && !PLATFORM(QT)
-#define NOMINMAX /* Windows min and max conflict with standard macros */
#define NOSHLWAPI /* shlwapi.h not available on WinCe */
/* MSDN documentation says these functions are provided with uspce.lib. But we cannot find this file. */
Modified: trunk/Source/cmake/OptionsWinCE.cmake (123323 => 123324)
--- trunk/Source/cmake/OptionsWinCE.cmake 2012-07-23 09:58:34 UTC (rev 123323)
+++ trunk/Source/cmake/OptionsWinCE.cmake 2012-07-23 10:05:19 UTC (rev 123324)
@@ -1,5 +1,6 @@
INCLUDE(OptionsWindows)
+ADD_DEFINITIONS(-D_CE_CRT_ALLOW_WIN_MINMAX)
ADD_DEFINITIONS(-DWTF_USE_WINCE_UNICODE=1)
ADD_DEFINITIONS(-DWTF_USE_WININET=1)
ADD_DEFINITIONS(-DWTF_CPU_ARM_TRADITIONAL -DWINCEBASIC)
Modified: trunk/Source/cmake/OptionsWindows.cmake (123323 => 123324)
--- trunk/Source/cmake/OptionsWindows.cmake 2012-07-23 09:58:34 UTC (rev 123323)
+++ trunk/Source/cmake/OptionsWindows.cmake 2012-07-23 10:05:19 UTC (rev 123324)
@@ -1,7 +1,7 @@
ADD_DEFINITIONS(-DWTF_PLATFORM_WIN=1)
SET(WTF_PLATFORM_WIN 1)
-ADD_DEFINITIONS(-DUNICODE)
+ADD_DEFINITIONS(-DNOMINMAX -DUNICODE)
INCLUDE_DIRECTORIES(${_javascript_CORE_DIR}/os-win32)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
