Merge branch 'dev' into dev-slice

This commit is contained in:
Daan Leijen 2021-02-22 14:28:22 -08:00
commit 8f69e7095d
10 changed files with 16 additions and 21 deletions

View file

@ -309,7 +309,7 @@ static void _mi_thread_done(mi_heap_t* default_heap);
// nothing to do as it is done in DllMain
#elif defined(_WIN32) && !defined(MI_SHARED_LIB)
// use thread local storage keys to detect thread ending
#include <Windows.h>
#include <windows.h>
#include <fibersapi.h>
#if (_WIN32_WINNT < 0x600) // before Windows Vista
WINBASEAPI DWORD WINAPI FlsAlloc( _In_opt_ PFLS_CALLBACK_FUNCTION lpCallback );