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

Timestamp:

Sep 15, 2009, 6:03:32 AM (16 years ago)

Author:

[email protected]

Message:

[Qt] Build fix for windows.

Patch by Csaba Osztrogonac <​[email protected]> on 2009-09-15
Reviewed by Tor Arne Vestbø.

After ​http://trac.webkit.org/changeset/47795 the MinGW build broke,
because MinGW has mingw_aligned_malloc instead of _aligned_malloc.

• runtime/Collector.cpp:

(JSC::Heap::allocateBlock): MinGW case added.
(JSC::Heap::freeBlock): MinGW case added.

File:

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

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -238 +238 @@
     memset(reinterpret_cast<void*>(address), 0, BLOCK_SIZE);
 #elif PLATFORM(WIN_OS)
+#if COMPILER(MINGW)
+    void* address = __mingw_aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
+#else
     void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
+#endif
     memset(address, 0, BLOCK_SIZE);
 #elif HAVE(POSIX_MEMALIGN)
@@ -316 +320 @@
     userChunk->Free(reinterpret_cast<TAny*>(block));
 #elif PLATFORM(WIN_OS)
+#if COMPILER(MINGW)
+    __mingw_aligned_free(block);
+#else
     _aligned_free(block);
+#endif
 #elif HAVE(POSIX_MEMALIGN)
     free(block);