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

@ -28,7 +28,7 @@ terms of the MIT license. A copy of the license can be found in the file
#if defined(_WIN32)
#include <Windows.h>
#include <windows.h>
#elif defined(__wasi__)
// stdlib.h is all we need, and has already been included in mimalloc.h
#else