merge from dev-win

This commit is contained in:
daan 2019-10-28 12:33:01 -07:00
commit 9d4f57abf3
11 changed files with 147 additions and 64 deletions

View file

@ -208,10 +208,6 @@ uintptr_t _mi_random_init(uintptr_t seed /* can be zero */) {
return x;
}
uintptr_t _mi_ptr_cookie(const void* p) {
return ((uintptr_t)p ^ _mi_heap_main.cookie);
}
/* -----------------------------------------------------------
Initialization and freeing of the thread local heaps
----------------------------------------------------------- */