Changeset 90649 in webkit


Ignore:
Timestamp:
Jul 8, 2011 11:59:27 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

Patch by Kalev Lember <kalev@smartlink.ee> on 2011-07-08
Reviewed by Adam Roben.

Add missing _WIN32_WINNT and WINVER definitions
https://bugs.webkit.org/show_bug.cgi?id=59702

Moved _WIN32_WINNT and WINVER definitions to config.h so that they are
available for all source files.

In particular, wtf/FastMalloc.cpp uses CreateTimerQueueTimer and
DeleteTimerQueueTimer which are both guarded by
#if (_WIN32_WINNT >= 0x0500)
in MinGW headers.

  • config.h:
  • wtf/Assertions.cpp:
Location:
trunk/Source/JavaScriptCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r90643 r90649  
     12011-07-08  Kalev Lember  <kalev@smartlink.ee>
     2
     3        Reviewed by Adam Roben.
     4
     5        Add missing _WIN32_WINNT and WINVER definitions
     6        https://bugs.webkit.org/show_bug.cgi?id=59702
     7
     8        Moved _WIN32_WINNT and WINVER definitions to config.h so that they are
     9        available for all source files.
     10
     11        In particular, wtf/FastMalloc.cpp uses CreateTimerQueueTimer and
     12        DeleteTimerQueueTimer which are both guarded by
     13        #if (_WIN32_WINNT >= 0x0500)
     14        in MinGW headers.
     15
     16        * config.h:
     17        * wtf/Assertions.cpp:
     18
    1192011-07-08  Chang Shu  <cshu@webkit.org>
    220
  • trunk/Source/JavaScriptCore/config.h

    r83121 r90649  
    6767#if OS(WINDOWS)
    6868
     69#ifndef _WIN32_WINNT
     70#define _WIN32_WINNT 0x0500
     71#endif
     72
     73#ifndef WINVER
     74#define WINVER 0x0500
     75#endif
     76
    6977// If we don't define these, they get defined in windef.h.
    7078// We want to use std::min and std::max
  • trunk/Source/JavaScriptCore/wtf/Assertions.cpp

    r85496 r90649  
    4343
    4444#if COMPILER(MSVC) && !OS(WINCE) && !PLATFORM(BREWMP)
    45 #ifndef WINVER
    46 #define WINVER 0x0500
    47 #endif
    48 #ifndef _WIN32_WINNT
    49 #define _WIN32_WINNT 0x0500
    50 #endif
    5145#include <crtdbg.h>
    5246#endif
Note: See TracChangeset for help on using the changeset viewer.