Changeset 57025 in webkit for trunk/JavaScriptCore/runtime/Collector.cpp

Timestamp:

Apr 2, 2010, 2:53:08 PM (15 years ago)

Author:

[email protected]

Message:

2010-04-02 Ruben Van Boxem <​[email protected]>

Reviewed by Eric Seidel.

Mingw-w64 fixes for JavaScriptCore
​https://bugs.webkit.org/show_bug.cgi?id=35607

• runtime/Collector.cpp: use the msvc code for mingw-w64 (but not mingw-w32) (JSC::Heap::allocateBlock): (JSC::Heap::freeBlockPtr): (JSC::currentThreadStackBase): (JSC::currentThreadStackBase):
• wtf/Platform.h: added COMPILER(MINGW64) check to differentiate between mingw.org and mingw-w64 functions

File:

• trunk/JavaScriptCore/runtime/Collector.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -202 +202 @@
     void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 #elif OS(WINDOWS)
-#if COMPILER(MINGW) && !defined(__MINGW64_VERSION_MAJOR)
+#if COMPILER(MINGW) && !COMPILER(MINGW64)
     void* address = __mingw_aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
 #else
@@ -293 +293 @@
     VirtualFree(block, 0, MEM_RELEASE);
 #elif OS(WINDOWS)
-#if COMPILER(MINGW) && !defined(__MINGW64_VERSION_MAJOR)
+#if COMPILER(MINGW) && !COMPILER(MINGW64)
     __mingw_aligned_free(block);
 #else