Commit 1f9d5c5c authored by paroga@webkit.org's avatar 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.

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: http://svn.webkit.org/repository/webkit/trunk@156302 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 95454835
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
......@@ -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
......
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
......
......@@ -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
......
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
......@@ -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>
......
......@@ -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_
......
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).
......
......@@ -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
......
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.
......
......@@ -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
......
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
......
......@@ -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
......@@ -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
......
......@@ -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)
......
......@@ -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);
......
......@@ -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__) */
......
......@@ -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
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.
......
......@@ -33,7 +33,7 @@ nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
<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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment