Changeset 156302 in webkit


Ignore:
Timestamp:
Sep 23, 2013 3:25:25 PM (11 years ago)
Author:
Patrick Gansterer
Message:

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:
Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r156300 r156302  
     12013-09-23  Patrick Gansterer  <paroga@webkit.org>
     2
     3        use NOMINMAX instead of #define min min
     4        https://bugs.webkit.org/show_bug.cgi?id=73563
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Use NOMINMAX instead of #define min/max as a cleaner
     9        way of ensuring that Windows system header files don't
     10        define min/max as macro in the first place.
     11
     12        * config.h:
     13
    1142013-09-23  Filip Pizlo  <fpizlo@apple.com>
    215

  • trunk/Source/JavaScriptCore/config.h

    r153162 r156302  
    4444#endif
    4545
    46 // If we don't define these, they get defined in windef.h.
    47 // We want to use std::min and std::max
    48 #define max max
    49 #define min min
    50 
    5146#if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
    5247// We need to define this before the first #include of stdlib.h or it won't contain rand_s.

  • trunk/Source/WTF/ChangeLog

    r156298 r156302  
     12013-09-23  Patrick Gansterer  <paroga@webkit.org>
     2
     3        use NOMINMAX instead of #define min min
     4        https://bugs.webkit.org/show_bug.cgi?id=73563
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Use NOMINMAX instead of #define min/max as a cleaner
     9        way of ensuring that Windows system header files don't
     10        define min/max as macro in the first place.
     11
     12        * config.h:
     13
    1142013-09-23  Anders Carlsson  <andersca@apple.com>
    215

  • trunk/Source/WTF/config.h

    r140930 r156302  
    4141#endif
    4242
    43 // If we don't define these, they get defined in windef.h.
    44 // We want to use std::min and std::max
    45 #define max max
    46 #define min min
    47 
    4843#if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
    4944// We need to define this before the first #include of stdlib.h or it won't contain rand_s.

  • trunk/Source/WebCore/ChangeLog

    r156301 r156302  
     12013-09-23  Patrick Gansterer  <paroga@webkit.org>
     2
     3        use NOMINMAX instead of #define min min
     4        https://bugs.webkit.org/show_bug.cgi?id=73563
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Use NOMINMAX instead of #define min/max as a cleaner
     9        way of ensuring that Windows system header files don't
     10        define min/max as macro in the first place.
     11
     12        * WebCorePrefix.h:
     13        * config.h:
     14
    1152013-09-23  Simon Fraser  <simon.fraser@apple.com>
    216

  • trunk/Source/WebCore/WebCorePrefix.h

    r152495 r156302  
    5252#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
    5353#endif
    54 #endif
    55 
    56 // If we don't define these, they get defined in windef.h.
    57 // We want to use std::min and std::max
    58 #ifdef __cplusplus
    59 #define max max
    60 #define min min
    6154#endif
    6255

  • trunk/Source/WebCore/config.h

    r152861 r156302  
    5555#ifndef WINVER
    5656#define WINVER 0x0502
    57 #endif
    58 
    59 // If we don't define these, they get defined in windef.h.
    60 // We want to use std::min and std::max.
    61 #ifndef max
    62 #define max max
    63 #endif
    64 #ifndef min
    65 #define min min
    6657#endif
    6758

  • trunk/Source/WebKit/win/ChangeLog

    r156249 r156302  
     12013-09-23  Patrick Gansterer  <paroga@webkit.org>
     2
     3        use NOMINMAX instead of #define min min
     4        https://bugs.webkit.org/show_bug.cgi?id=73563
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Use NOMINMAX instead of #define min/max as a cleaner
     9        way of ensuring that Windows system header files don't
     10        define min/max as macro in the first place.
     11
     12        * WebKitPrefix.h:
     13
    1142013-09-22  Sam Weinig  <sam@webkit.org>
    215

  • trunk/Source/WebKit/win/WebKitPrefix.h

    r140930 r156302  
    3535#endif
    3636
    37 // If we don't define these, they get defined in windef.h.
    38 // We want to use std::min and std::max.
    39 #ifndef max
    40 #define max max
    41 #endif
    42 #ifndef min
    43 #define min min
    44 #endif
    45 
    4637#ifndef _WINSOCKAPI_
    4738#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h

  • trunk/Source/WebKit2/ChangeLog

    r156287 r156302  
     12013-09-23  Patrick Gansterer  <paroga@webkit.org>
     2
     3        use NOMINMAX instead of #define min min
     4        https://bugs.webkit.org/show_bug.cgi?id=73563
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Use NOMINMAX instead of #define min/max as a cleaner
     9        way of ensuring that Windows system header files don't
     10        define min/max as macro in the first place.
     11
     12        * config.h:
     13
    1142013-09-23  ChangSeok Oh  <changseok.oh@collabora.com>
    215

  • trunk/Source/WebKit2/config.h

    r155032 r156302  
    6666#endif
    6767
    68 /* If we don't define these, they get defined in windef.h. */
    69 /* We want to use std::min and std::max. */
    70 #ifndef max
    71 #define max max
    72 #endif
    73 #ifndef min
    74 #define min min
    75 #endif
    76 
    7768#ifndef _WINSOCKAPI_
    7869#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */

  • trunk/Tools/ChangeLog

    r156299 r156302  
     12013-09-23  Patrick Gansterer  <paroga@webkit.org>
     2
     3        use NOMINMAX instead of #define min min
     4        https://bugs.webkit.org/show_bug.cgi?id=73563
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Use NOMINMAX instead of #define min/max as a cleaner
     9        way of ensuring that Windows system header files don't
     10        define min/max as macro in the first place.
     11
     12        * DumpRenderTree/DumpRenderTreePrefix.h:
     13        * DumpRenderTree/cg/ImageDiffCG.cpp:
     14        * DumpRenderTree/config.h:
     15        * DumpRenderTree/win/ImageDiffCairo.cpp:
     16        * WebKitTestRunner/WebKitTestRunnerPrefix.h:
     17        * WebKitTestRunner/config.h:
     18
    1192013-09-23  Benjamin Poulain  <benjamin@webkit.org>
    220

  • trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h

    r107775 r156302  
    3232
    3333#endif
    34 
    35 #if defined(WIN32) || defined(_WIN32)
    36 
    37 // If we don't define these, they get defined in windef.h.
    38 // We want to use std::min and std::max
    39 #define max max
    40 #define min min
    41 
    42 #endif

  • trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp

    r149716 r156302  
    2525 */
    2626
    27 #if defined(WIN32) || defined(_WIN32)
    28 #define max max
    29 #define min min
    30 #endif
    31 
    3227// FIXME: We need to be able to include these defines from a config.h somewhere.
    3328#define JS_EXPORT_PRIVATE

  • trunk/Tools/DumpRenderTree/config.h

    r148980 r156302  
    5757#endif // PLATFORM(MAC)
    5858
    59 #if OS(WINDOWS)
    60 // If we don't define these, they get defined in windef.h.
    61 // We want to use std::min and std::max
    62 #undef max
    63 #define max max
    64 #undef min
    65 #define min min
    66 #endif
    67 
    6859#if PLATFORM(WIN)
    6960#define WTF_USE_CF 1

  • trunk/Tools/DumpRenderTree/win/ImageDiffCairo.cpp

    r149716 r156302  
    5151
    5252#if PLATFORM(WIN)
    53 #undef min
    54 #undef max
    55 
    5653static inline float strtof(const char* inputString, char** endptr)
    5754{

  • trunk/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h

    r124163 r156302  
    2828#endif
    2929
    30 #if defined(WIN32) || defined(_WIN32)
    31 // If we don't define these, they get defined in windef.h.
    32 // We want to use std::min and std::max
    33 #define max max
    34 #define min min
    35 #endif
    36 
    3730#if defined(BUILDING_GTK__)
    3831#include "autotoolsconfig.h"

  • trunk/Tools/WebKitTestRunner/config.h

    r147866 r156302  
    4747#endif
    4848
    49 #if OS(WINDOWS)
    50 /* If we don't define these, they get defined in windef.h. */
    51 /* We want to use std::min and std::max. */
    52 #ifndef max
    53 #define max max
    5449#endif
    55 #ifndef min
    56 #define min min
    57 #endif
    58 #endif
    59 
    60 #endif

  • trunk/WebKitLibraries/ChangeLog

    r156218 r156302  
     12013-09-23  Patrick Gansterer  <paroga@webkit.org>
     2
     3        use NOMINMAX instead of #define min min
     4        https://bugs.webkit.org/show_bug.cgi?id=73563
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Use NOMINMAX instead of #define min/max as a cleaner
     9        way of ensuring that Windows system header files don't
     10        define min/max as macro in the first place.
     11
     12        * win/tools/vsprops/common.props:
     13
    1142013-09-20  Mark Rowe  <mrowe@apple.com>
    215

  • trunk/WebKitLibraries/win/tools/vsprops/common.props

    r156060 r156302  
    3434    <ClCompile>
    3535      <AdditionalOptions>/bigobj /GS %(AdditionalOptions)</AdditionalOptions>
    36       <PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     36      <PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);NOMINMAX;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    3737      <PreprocessorDefinitions Condition="$(Platform)=='Win32'">WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    3838      <PreprocessorDefinitions Condition="$(Platform)=='Win64'">x64</PreprocessorDefinitions>
Note: See TracChangeset for help on using the changeset viewer.