Merge branch 'dev' into dev-slice

This commit is contained in:
Daan Leijen 2021-06-06 20:31:53 -07:00
commit 7b595bd957
21 changed files with 63 additions and 63 deletions

View file

@ -10,7 +10,7 @@ terms of the MIT license. A copy of the license can be found in the file
#include <stddef.h> // ptrdiff_t
#include <stdint.h> // uintptr_t, uint16_t, etc
#include <mimalloc-atomic.h> // _Atomic
#include "mimalloc-atomic.h" // _Atomic
#ifdef _MSC_VER
#pragma warning(disable:4214) // bitfield is not int