use NOMINMAX instead of #define min min

https://bugs.webkit.org/show_bug.cgi?id=73563

Reviewed by Brent Fulgham.

Use NOMINMAX instead of #define min/max as a cleaner
way of ensuring that Windows system header files don't
define min/max as macro in the first place.

Source/JavaScriptCore:

* config.h:

Source/WebCore:

* WebCorePrefix.h:
* config.h:

Source/WebKit/win:

* WebKitPrefix.h:

Source/WebKit2:

* config.h:

Source/WTF:

* config.h:

Tools:

* DumpRenderTree/DumpRenderTreePrefix.h:
* DumpRenderTree/cg/ImageDiffCG.cpp:
* DumpRenderTree/config.h:
* DumpRenderTree/win/ImageDiffCairo.cpp:
* WebKitTestRunner/WebKitTestRunnerPrefix.h:
* WebKitTestRunner/config.h:

WebKitLibraries:

* win/tools/vsprops/common.props:

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index fbd7c29185bf92cc0af782b5ed782d277a537f75..2ca46b44dc5fc96136ecb3d2856afd0c252c8d66 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2013-09-23  Patrick Gansterer  <paroga@webkit.org>
+
+        use NOMINMAX instead of #define min min
+        https://bugs.webkit.org/show_bug.cgi?id=73563
+
+        Reviewed by Brent Fulgham.
+
+        Use NOMINMAX instead of #define min/max as a cleaner
+        way of ensuring that Windows system header files don't
+        define min/max as macro in the first place.
+
+        * config.h:
+
 2013-09-23  Filip Pizlo  <fpizlo@apple.com>
 
         Never use ReturnPC for exception handling and quit using exception check indices as a lame replica of the CodeOrigin index

diff --git a/Source/JavaScriptCore/config.h b/Source/JavaScriptCore/config.h
index 0142a9cd3bb17c163173e4fec40e3d1bc77316f0..beebec657b5c18e94943819f7f0b7282eab07cc2 100644 (file)
--- a/Source/JavaScriptCore/config.h
+++ b/Source/JavaScriptCore/config.h
@@ -43,11 +43,6 @@
 #define WINVER 0x0502
 #endif
 
-// If we don't define these, they get defined in windef.h. 
-// We want to use std::min and std::max
-#define max max
-#define min min
-
 #if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
 // We need to define this before the first #include of stdlib.h or it won't contain rand_s.
 #ifndef _CRT_RAND_S

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 3f5fc618ded390ecd8511d21068be330e441188b..ac94769772fbd3791638279fe0c93941b3a1d42b 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,16 @@
+2013-09-23  Patrick Gansterer  <paroga@webkit.org>
+
+        use NOMINMAX instead of #define min min
+        https://bugs.webkit.org/show_bug.cgi?id=73563
+
+        Reviewed by Brent Fulgham.
+
+        Use NOMINMAX instead of #define min/max as a cleaner
+        way of ensuring that Windows system header files don't
+        define min/max as macro in the first place.
+
+        * config.h:
+
 2013-09-23  Anders Carlsson  <andersca@apple.com>
 
         Remove PassTraits.h

diff --git a/Source/WTF/config.h b/Source/WTF/config.h
index 5552be3eecac5e185a83227f618fe2d941ab4dda..8476328776036b51e995aa13edc9e9684da539a5 100644 (file)
--- a/Source/WTF/config.h
+++ b/Source/WTF/config.h
@@ -40,11 +40,6 @@
 #define WINVER 0x0502
 #endif
 
-// If we don't define these, they get defined in windef.h. 
-// We want to use std::min and std::max
-#define max max
-#define min min
-
 #if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
 // We need to define this before the first #include of stdlib.h or it won't contain rand_s.
 #ifndef _CRT_RAND_S

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3e460eb41867c9a849b1398af47ff21954c3bae9..649f2ee3a4116d7bab6725b4cb684dce45a6d0eb 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2013-09-23  Patrick Gansterer  <paroga@webkit.org>
+
+        use NOMINMAX instead of #define min min
+        https://bugs.webkit.org/show_bug.cgi?id=73563
+
+        Reviewed by Brent Fulgham.
+
+        Use NOMINMAX instead of #define min/max as a cleaner
+        way of ensuring that Windows system header files don't
+        define min/max as macro in the first place.
+
+        * WebCorePrefix.h:
+        * config.h:
+
 2013-09-23  Simon Fraser  <simon.fraser@apple.com>
 
         REGRESSION (r155998): when zooming in, tiles are too small

diff --git a/Source/WebCore/WebCorePrefix.h b/Source/WebCore/WebCorePrefix.h
index 543f50f61545280ded135be4dc9449219dda125b..c15a89f0630d8488abaf139d13c48760ba4dfd8a 100644 (file)
--- a/Source/WebCore/WebCorePrefix.h
+++ b/Source/WebCore/WebCorePrefix.h
@@ -53,13 +53,6 @@
 #endif
 #endif
 
-// If we don't define these, they get defined in windef.h. 
-// We want to use std::min and std::max
-#ifdef __cplusplus
-#define max max
-#define min min
-#endif
-
 #else
 
 #include <pthread.h>

diff --git a/Source/WebCore/config.h b/Source/WebCore/config.h
index 30bed8e6a1f67bdd27259e45c8a683ad8bc97cda..653731c2a9ac0df65f5c1c955ce4eb49e7d6db2d 100644 (file)
--- a/Source/WebCore/config.h
+++ b/Source/WebCore/config.h
@@ -56,15 +56,6 @@
 #define WINVER 0x0502
 #endif
 
-// If we don't define these, they get defined in windef.h.
-// We want to use std::min and std::max.
-#ifndef max
-#define max max
-#endif
-#ifndef min
-#define min min
-#endif
-
 // CURL needs winsock, so don't prevent inclusion of it
 #if !USE(CURL)
 #ifndef _WINSOCKAPI_

diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index 1a0354557d877afe6ad7eb0d845da912e2ff0f2f..d94dbd0b62184d9aba98ff8c0603b4a1d01a9814 100644 (file)
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,3 +1,16 @@
+2013-09-23  Patrick Gansterer  <paroga@webkit.org>
+
+        use NOMINMAX instead of #define min min
+        https://bugs.webkit.org/show_bug.cgi?id=73563
+
+        Reviewed by Brent Fulgham.
+
+        Use NOMINMAX instead of #define min/max as a cleaner
+        way of ensuring that Windows system header files don't
+        define min/max as macro in the first place.
+
+        * WebKitPrefix.h:
+
 2013-09-22  Sam Weinig  <sam@webkit.org>
 
         Try to fix the windows build (take 2).

diff --git a/Source/WebKit/win/WebKitPrefix.h b/Source/WebKit/win/WebKitPrefix.h
index 92af4d02119c8294f2518cbe7cd7c7fb29729e7d..62cfe230fd173e19d031f483b550c9533341b82f 100644 (file)
--- a/Source/WebKit/win/WebKitPrefix.h
+++ b/Source/WebKit/win/WebKitPrefix.h
@@ -34,15 +34,6 @@
 #define WINVER 0x0502
 #endif
 
-// If we don't define these, they get defined in windef.h.
-// We want to use std::min and std::max.
-#ifndef max
-#define max max
-#endif
-#ifndef min
-#define min min
-#endif
-
 #ifndef _WINSOCKAPI_
 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
 #endif

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index e178a70b99d21d315c0beb294d1326d4eda80042..829d5659962c924c48999bd135045bffd4b85514 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2013-09-23  Patrick Gansterer  <paroga@webkit.org>
+
+        use NOMINMAX instead of #define min min
+        https://bugs.webkit.org/show_bug.cgi?id=73563
+
+        Reviewed by Brent Fulgham.
+
+        Use NOMINMAX instead of #define min/max as a cleaner
+        way of ensuring that Windows system header files don't
+        define min/max as macro in the first place.
+
+        * config.h:
+
 2013-09-23  ChangSeok Oh  <changseok.oh@collabora.com>
 
         [GTK][WK2] A plugin dirtyRect within iframe remains after moving to a different page.

diff --git a/Source/WebKit2/config.h b/Source/WebKit2/config.h
index caaed6344682d70f77eed4ba2a37a69d0d1793a4..ef41dc26546a89ab35fa0ea89c0e302d84a4577f 100644 (file)
--- a/Source/WebKit2/config.h
+++ b/Source/WebKit2/config.h
@@ -65,15 +65,6 @@ static const type& name() \
 #define WINVER 0x0502
 #endif
 
-/* If we don't define these, they get defined in windef.h. */
-/* We want to use std::min and std::max. */
-#ifndef max
-#define max max
-#endif
-#ifndef min
-#define min min
-#endif
-
 #ifndef _WINSOCKAPI_
 #define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
 #endif

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index bec6511f71ef26a2455e51c0bbee5ce78bb6cafc..b5640fe034005cbd16e50a1866ab6bd6d1df3073 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,21 @@
+2013-09-23  Patrick Gansterer  <paroga@webkit.org>
+
+        use NOMINMAX instead of #define min min
+        https://bugs.webkit.org/show_bug.cgi?id=73563
+
+        Reviewed by Brent Fulgham.
+
+        Use NOMINMAX instead of #define min/max as a cleaner
+        way of ensuring that Windows system header files don't
+        define min/max as macro in the first place.
+
+        * DumpRenderTree/DumpRenderTreePrefix.h:
+        * DumpRenderTree/cg/ImageDiffCG.cpp:
+        * DumpRenderTree/config.h:
+        * DumpRenderTree/win/ImageDiffCairo.cpp:
+        * WebKitTestRunner/WebKitTestRunnerPrefix.h:
+        * WebKitTestRunner/config.h:
+
 2013-09-23  Benjamin Poulain  <benjamin@webkit.org>
 
         Delete TestWebKitAPI domain or some keys before running TestWebKitAPI

diff --git a/Tools/DumpRenderTree/DumpRenderTreePrefix.h b/Tools/DumpRenderTree/DumpRenderTreePrefix.h
index 010ca019d75d6555491c6083a026a6b5bd2d24d6..cb4096808fffd2408a9347507d1981df178d8c2d 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTreePrefix.h
+++ b/Tools/DumpRenderTree/DumpRenderTreePrefix.h
@@ -31,12 +31,3 @@
 #import <Foundation/Foundation.h>
 
 #endif
-
-#if defined(WIN32) || defined(_WIN32)
-
-// If we don't define these, they get defined in windef.h. 
-// We want to use std::min and std::max
-#define max max
-#define min min
-
-#endif

diff --git a/Tools/DumpRenderTree/cg/ImageDiffCG.cpp b/Tools/DumpRenderTree/cg/ImageDiffCG.cpp
index 900f1ba15209e1906c269d6f8a51e1f152ac3249..7b0db88376fd0a99822d3ffd710f07ca9d9b2934 100644 (file)
--- a/Tools/DumpRenderTree/cg/ImageDiffCG.cpp
+++ b/Tools/DumpRenderTree/cg/ImageDiffCG.cpp
@@ -24,11 +24,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(WIN32) || defined(_WIN32)
-#define max max
-#define min min
-#endif
-
 // FIXME: We need to be able to include these defines from a config.h somewhere.
 #define JS_EXPORT_PRIVATE
 #define WTF_EXPORT_PRIVATE

diff --git a/Tools/DumpRenderTree/config.h b/Tools/DumpRenderTree/config.h
index 6424465dc316f56e851225590fb784e247818736..ddb1d51953ef1d1d4de958dcd68f132701a87dc1 100644 (file)
--- a/Tools/DumpRenderTree/config.h
+++ b/Tools/DumpRenderTree/config.h
@@ -56,15 +56,6 @@
 
 #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)

diff --git a/Tools/DumpRenderTree/win/ImageDiffCairo.cpp b/Tools/DumpRenderTree/win/ImageDiffCairo.cpp
index d5a81b495eee88d14144a40af1387cfa88a70911..0ea171be1ad3cda2a96679714df70828430722c6 100644 (file)
--- a/Tools/DumpRenderTree/win/ImageDiffCairo.cpp
+++ b/Tools/DumpRenderTree/win/ImageDiffCairo.cpp
@@ -50,9 +50,6 @@ static cairo_user_data_key_t s_imageDataKey;
 
 
 #if PLATFORM(WIN)
-#undef min
-#undef max
-
 static inline float strtof(const char* inputString, char** endptr)
 {
     return strtod(inputString, endptr);

diff --git a/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h b/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
index ac61ad7ec4c96ce86c7e3d7cd0b82438b8ab60be..d83143b92ff362de666f94e5e11aa319b65de3f8 100644 (file)
--- a/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
+++ b/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
@@ -27,13 +27,6 @@
 #include <Cocoa/Cocoa.h>
 #endif
 
-#if defined(WIN32) || defined(_WIN32)
-// If we don't define these, they get defined in windef.h. 
-// We want to use std::min and std::max
-#define max max
-#define min min
-#endif
-
 #if defined(BUILDING_GTK__)
 #include "autotoolsconfig.h"
 #endif /* defined (BUILDING_GTK__) */

diff --git a/Tools/WebKitTestRunner/config.h b/Tools/WebKitTestRunner/config.h
index d5cd2f97d3974b94996d58ae996a9189e2a2ff1b..f6c3dd2c749a0a8908bfbb0599bfd87ecd685f07 100644 (file)
--- a/Tools/WebKitTestRunner/config.h
+++ b/Tools/WebKitTestRunner/config.h
@@ -46,15 +46,4 @@
 #endif
 #endif
 
-#if OS(WINDOWS)
-/* If we don't define these, they get defined in windef.h. */
-/* We want to use std::min and std::max. */
-#ifndef max
-#define max max
-#endif
-#ifndef min
-#define min min
-#endif
-#endif
-
 #endif

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 96be08489f1092084705bbe3717a4bfc434509c8..ea2e88e85fce84afd319cc55f5339f31c9124a5f 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,16 @@
+2013-09-23  Patrick Gansterer  <paroga@webkit.org>
+
+        use NOMINMAX instead of #define min min
+        https://bugs.webkit.org/show_bug.cgi?id=73563
+
+        Reviewed by Brent Fulgham.
+
+        Use NOMINMAX instead of #define min/max as a cleaner
+        way of ensuring that Windows system header files don't
+        define min/max as macro in the first place.
+
+        * win/tools/vsprops/common.props:
+
 2013-09-20  Mark Rowe  <mrowe@apple.com>
 
         Fix link errors for external users when building WebKit with Xcode 5.

diff --git a/WebKitLibraries/win/tools/vsprops/common.props b/WebKitLibraries/win/tools/vsprops/common.props
index 4a919f6e793530758d2ac779ea451b2e9ca19336..022696886634db0325018a8610e2eaeb2f5d5ace 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/common.props
+++ b/WebKitLibraries/win/tools/vsprops/common.props
@@ -33,7 +33,7 @@ nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
   <ItemDefinitionGroup>\r
     <ClCompile>\r
       <AdditionalOptions>/bigobj /GS %(AdditionalOptions)</AdditionalOptions>\r
-      <PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);NOMINMAX;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="$(Platform)=='Win32'">WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="$(Platform)=='Win64'">x64</PreprocessorDefinitions>\r
       <ExceptionHandling>false</ExceptionHandling>\r