Merge branch 'dev' into dev-win

This commit is contained in:
daan 2019-08-19 21:25:09 -07:00
commit 29e73dec22

View file

@ -143,7 +143,6 @@ static bool mi_region_commit_blocks(mem_region_t* region, size_t idx, size_t bit
} while (!mi_atomic_compare_exchange(&region->map, map & ~mask, map)); } while (!mi_atomic_compare_exchange(&region->map, map & ~mask, map));
return false; return false;
} }
Sleep(10);
// set the newly allocated region // set the newly allocated region
if (mi_atomic_compare_exchange_ptr(&region->start, start, NULL)) { if (mi_atomic_compare_exchange_ptr(&region->start, start, NULL)) {