Changeset 126356 in webkit


Ignore:
Timestamp:
Aug 22, 2012 2:55:25 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Don't unconditionally define NOMINMAX on Windows
​https://bugs.webkit.org/show_bug.cgi?id=94742

Patch by Scott Graham <​scottmg@chromium.org> on 2012-08-22
Reviewed by Adrienne Walker.

Avoids a warning when building on Windows when NOMINMAX is defined
elsewhere or on the command line.

  • TestWebKitAPI/config.h:
Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r126353 r126356  
     12012-08-22  Scott Graham  <scottmg@chromium.org>
     2
     3        Don't unconditionally define NOMINMAX on Windows
     4        https://bugs.webkit.org/show_bug.cgi?id=94742
     5
     6        Reviewed by Adrienne Walker.
     7
     8        Avoids a warning when building on Windows when NOMINMAX is defined
     9        elsewhere or on the command line.
     10
     11        * TestWebKitAPI/config.h:
     12
    1132012-08-22  Zan Dobersek  <zandobersek@gmail.com>
    214

  • trunk/Tools/TestWebKitAPI/config.h

    r124163 r126356  
    4444#elif defined(WIN32) || defined(_WIN32)
    4545
     46#ifndef NOMINMAX
    4647#define NOMINMAX
     48#endif
    4749
    4850#endif
Note: See TracChangeset for help on using the changeset viewer.