Title: [90649] trunk/Source/_javascript_Core
Revision
90649
Author
[email protected]
Date
2011-07-08 11:59:27 -0700 (Fri, 08 Jul 2011)

Log Message

Patch by Kalev Lember <[email protected]> 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:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (90648 => 90649)


--- trunk/Source/_javascript_Core/ChangeLog	2011-07-08 18:47:49 UTC (rev 90648)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-07-08 18:59:27 UTC (rev 90649)
@@ -1,3 +1,21 @@
+2011-07-08  Kalev Lember  <[email protected]>
+
+        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:
+
 2011-07-08  Chang Shu  <[email protected]>
 
         Rename "makeSecure" to "fill" and remove the support for displaying last character

Modified: trunk/Source/_javascript_Core/config.h (90648 => 90649)


--- trunk/Source/_javascript_Core/config.h	2011-07-08 18:47:49 UTC (rev 90648)
+++ trunk/Source/_javascript_Core/config.h	2011-07-08 18:59:27 UTC (rev 90649)
@@ -66,6 +66,14 @@
 
 #if OS(WINDOWS)
 
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+#endif
+
+#ifndef WINVER
+#define WINVER 0x0500
+#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

Modified: trunk/Source/_javascript_Core/wtf/Assertions.cpp (90648 => 90649)


--- trunk/Source/_javascript_Core/wtf/Assertions.cpp	2011-07-08 18:47:49 UTC (rev 90648)
+++ trunk/Source/_javascript_Core/wtf/Assertions.cpp	2011-07-08 18:59:27 UTC (rev 90649)
@@ -42,12 +42,6 @@
 #endif
 
 #if COMPILER(MSVC) && !OS(WINCE) && !PLATFORM(BREWMP)
-#ifndef WINVER
-#define WINVER 0x0500
-#endif
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
-#endif
 #include <crtdbg.h>
 #endif
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to