Merge branch 'master' into dev

This commit is contained in:
daan 2019-09-02 09:53:34 -07:00
commit 8ef8ddecc5
3 changed files with 37 additions and 32 deletions

View file

@ -10,7 +10,7 @@ terms of the MIT license. A copy of the license can be found in the file
#include "mimalloc-types.h"
#if defined(MI_MALLOC_OVERRIDE) && defined(__APPLE__)
#if defined(MI_MALLOC_OVERRIDE) && (defined(__APPLE__) || defined(__OpenBSD__))
#define MI_TLS_RECURSE_GUARD
#endif