Diff
Modified: branches/safari-537.60-branch/Source/_javascript_Core/ChangeLog (158132 => 158133)
--- branches/safari-537.60-branch/Source/_javascript_Core/ChangeLog 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/_javascript_Core/ChangeLog 2013-10-28 21:43:05 UTC (rev 158133)
@@ -1,3 +1,20 @@
+2013-10-28 Lucas Forschler <[email protected]>
+
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <[email protected]>
+
+ 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-08-08 Lucas Forschler <[email protected]>
Merge r153819
Modified: branches/safari-537.60-branch/Source/_javascript_Core/config.h (158132 => 158133)
--- branches/safari-537.60-branch/Source/_javascript_Core/config.h 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/_javascript_Core/config.h 2013-10-28 21:43:05 UTC (rev 158133)
@@ -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
Modified: branches/safari-537.60-branch/Source/WTF/ChangeLog (158132 => 158133)
--- branches/safari-537.60-branch/Source/WTF/ChangeLog 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/WTF/ChangeLog 2013-10-28 21:43:05 UTC (rev 158133)
@@ -1,5 +1,22 @@
2013-10-28 Lucas Forschler <[email protected]>
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <[email protected]>
+
+ 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-10-28 Lucas Forschler <[email protected]>
+
Merge r156933
2013-10-04 Brent Fulgham <[email protected]>
Modified: branches/safari-537.60-branch/Source/WTF/config.h (158132 => 158133)
--- branches/safari-537.60-branch/Source/WTF/config.h 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/WTF/config.h 2013-10-28 21:43:05 UTC (rev 158133)
@@ -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
Modified: branches/safari-537.60-branch/Source/WebCore/ChangeLog (158132 => 158133)
--- branches/safari-537.60-branch/Source/WebCore/ChangeLog 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/WebCore/ChangeLog 2013-10-28 21:43:05 UTC (rev 158133)
@@ -1,3 +1,21 @@
+2013-10-28 Lucas Forschler <[email protected]>
+
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <[email protected]>
+
+ 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-26 Lucas Forschler <[email protected]>
Merge r156416
Modified: branches/safari-537.60-branch/Source/WebCore/WebCorePrefix.h (158132 => 158133)
--- branches/safari-537.60-branch/Source/WebCore/WebCorePrefix.h 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/WebCore/WebCorePrefix.h 2013-10-28 21:43:05 UTC (rev 158133)
@@ -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>
Modified: branches/safari-537.60-branch/Source/WebCore/config.h (158132 => 158133)
--- branches/safari-537.60-branch/Source/WebCore/config.h 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/WebCore/config.h 2013-10-28 21:43:05 UTC (rev 158133)
@@ -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_
Modified: branches/safari-537.60-branch/Source/WebKit/win/ChangeLog (158132 => 158133)
--- branches/safari-537.60-branch/Source/WebKit/win/ChangeLog 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/WebKit/win/ChangeLog 2013-10-28 21:43:05 UTC (rev 158133)
@@ -1,3 +1,20 @@
+2013-10-28 Lucas Forschler <[email protected]>
+
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <[email protected]>
+
+ 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-26 Lucas Forschler <[email protected]>
Merge r156433
Modified: branches/safari-537.60-branch/Source/WebKit/win/WebKitPrefix.h (158132 => 158133)
--- branches/safari-537.60-branch/Source/WebKit/win/WebKitPrefix.h 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/WebKit/win/WebKitPrefix.h 2013-10-28 21:43:05 UTC (rev 158133)
@@ -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
Modified: branches/safari-537.60-branch/Source/WebKit2/ChangeLog (158132 => 158133)
--- branches/safari-537.60-branch/Source/WebKit2/ChangeLog 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/WebKit2/ChangeLog 2013-10-28 21:43:05 UTC (rev 158133)
@@ -1,3 +1,20 @@
+2013-10-28 Lucas Forschler <[email protected]>
+
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <[email protected]>
+
+ 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-08-09 Lucas Forschler <[email protected]>
Merge r153907
Modified: branches/safari-537.60-branch/Source/WebKit2/config.h (158132 => 158133)
--- branches/safari-537.60-branch/Source/WebKit2/config.h 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/WebKit2/config.h 2013-10-28 21:43:05 UTC (rev 158133)
@@ -65,15 +65,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
Modified: branches/safari-537.60-branch/Tools/ChangeLog (158132 => 158133)
--- branches/safari-537.60-branch/Tools/ChangeLog 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Tools/ChangeLog 2013-10-28 21:43:05 UTC (rev 158133)
@@ -1,3 +1,25 @@
+2013-10-28 Lucas Forschler <[email protected]>
+
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <[email protected]>
+
+ 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-08-15 Lucas Forschler <[email protected]>
Merge r154115
Modified: branches/safari-537.60-branch/Tools/DumpRenderTree/DumpRenderTreePrefix.h (158132 => 158133)
--- branches/safari-537.60-branch/Tools/DumpRenderTree/DumpRenderTreePrefix.h 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Tools/DumpRenderTree/DumpRenderTreePrefix.h 2013-10-28 21:43:05 UTC (rev 158133)
@@ -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
Modified: branches/safari-537.60-branch/Tools/DumpRenderTree/cg/ImageDiffCG.cpp (158132 => 158133)
--- branches/safari-537.60-branch/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2013-10-28 21:43:05 UTC (rev 158133)
@@ -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
Modified: branches/safari-537.60-branch/Tools/DumpRenderTree/config.h (158132 => 158133)
--- branches/safari-537.60-branch/Tools/DumpRenderTree/config.h 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Tools/DumpRenderTree/config.h 2013-10-28 21:43:05 UTC (rev 158133)
@@ -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)
Modified: branches/safari-537.60-branch/Tools/DumpRenderTree/win/ImageDiffCairo.cpp (158132 => 158133)
--- branches/safari-537.60-branch/Tools/DumpRenderTree/win/ImageDiffCairo.cpp 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Tools/DumpRenderTree/win/ImageDiffCairo.cpp 2013-10-28 21:43:05 UTC (rev 158133)
@@ -50,9 +50,6 @@
#if PLATFORM(WIN)
-#undef min
-#undef max
-
static inline float strtof(const char* inputString, char** endptr)
{
return strtod(inputString, endptr);
Modified: branches/safari-537.60-branch/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h (158132 => 158133)
--- branches/safari-537.60-branch/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h 2013-10-28 21:43:05 UTC (rev 158133)
@@ -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__) */
Modified: branches/safari-537.60-branch/Tools/WebKitTestRunner/config.h (158132 => 158133)
--- branches/safari-537.60-branch/Tools/WebKitTestRunner/config.h 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Tools/WebKitTestRunner/config.h 2013-10-28 21:43:05 UTC (rev 158133)
@@ -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
Modified: branches/safari-537.60-branch/WebKitLibraries/ChangeLog (158132 => 158133)
--- branches/safari-537.60-branch/WebKitLibraries/ChangeLog 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/WebKitLibraries/ChangeLog 2013-10-28 21:43:05 UTC (rev 158133)
@@ -1,3 +1,20 @@
+2013-10-28 Lucas Forschler <[email protected]>
+
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <[email protected]>
+
+ 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-17 Lucas Forschler <[email protected]>
Merge r154390
Modified: branches/safari-537.60-branch/WebKitLibraries/win/tools/vsprops/common.props (158132 => 158133)
--- branches/safari-537.60-branch/WebKitLibraries/win/tools/vsprops/common.props 2013-10-28 21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/WebKitLibraries/win/tools/vsprops/common.props 2013-10-28 21:43:05 UTC (rev 158133)
@@ -30,7 +30,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalOptions>/bigobj /GS %(AdditionalOptions)</AdditionalOptions>
- <PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);NOMINMAX;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="$(Platform)=='Win32'">WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="$(Platform)=='Win64'">x64</PreprocessorDefinitions>
<ExceptionHandling>false</ExceptionHandling>
