Merge branch 'master' into dev

This commit is contained in:
daan 2019-06-25 19:45:59 -07:00
commit cae02b4676
2 changed files with 54 additions and 1 deletions

View file

@ -234,10 +234,12 @@ static bool _mi_heap_done(void) {
}
_mi_os_free(heap, sizeof(mi_thread_data_t), &_mi_stats_main);
}
else if (MI_DEBUG > 0) {
#if (MI_DEBUG > 0)
else {
_mi_heap_destroy_pages(heap);
mi_assert_internal(heap->tld->heap_backing == &_mi_heap_main);
}
#endif
return false;
}