Commit 8a21225144f7c1e10ffcb9aa7a545164d9495bf2
Fix compilation on 64-bit X86 with MinGW
| |   |
| 231 | 231 | #elif OS(WINCE) |
| 232 | 232 | void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); |
| 233 | 233 | #elif OS(WINDOWS) |
| #if COMPILER(MINGW) |
| #if COMPILER(MINGW) && !CPU(X86_64) |
| 235 | 235 | void* address = __mingw_aligned_malloc(BLOCK_SIZE, BLOCK_SIZE); |
| 236 | 236 | #else |
| 237 | 237 | void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE); |
| … | … | |
| 324 | 324 | #elif OS(WINCE) |
| 325 | 325 | VirtualFree(block, 0, MEM_RELEASE); |
| 326 | 326 | #elif OS(WINDOWS) |
| #if COMPILER(MINGW) |
| #if COMPILER(MINGW) && !CPU(X86_64) |
| 328 | 328 | __mingw_aligned_free(block); |
| 329 | 329 | #else |
| 330 | 330 | _aligned_free(block); |
| … | … | |
| 622 | 622 | MOV pTib, EAX |
| 623 | 623 | } |
| 624 | 624 | return static_cast<void*>(pTib->StackBase); |
| #elif OS(WINDOWS) && CPU(X86_64) && COMPILER(MSVC) |
| #elif OS(WINDOWS) && CPU(X86_64) && (COMPILER(MSVC) || COMPILER(GCC)) |
| 626 | 626 | // FIXME: why only for MSVC? |
| 627 | 627 | PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb()); |
| 628 | 628 | return reinterpret_cast<void*>(pTib->StackBase); |