merge from dev, bump version to v2.1.7
This commit is contained in:
@@ -177,7 +177,12 @@ static void* mi_arena_meta_zalloc(size_t size, mi_memid_t* memid, mi_stats_t* st
|
||||
*memid = _mi_memid_none();
|
||||
|
||||
// try static
|
||||
void* p = mi_arena_static_zalloc(size, MI_MAX_ALIGN_SIZE, memid);
|
||||
void* p = NULL;
|
||||
#if (MI_INTPTR_SIZE==4 && MI_LIBC_MUSL) // fix 32-bit musl compilation, issue #895
|
||||
MI_UNUSED(mi_arena_static_zalloc);
|
||||
#else
|
||||
p = mi_arena_static_zalloc(size, MI_MAX_ALIGN_SIZE, memid);
|
||||
#endif
|
||||
if (p != NULL) return p;
|
||||
|
||||
// or fall back to the OS
|
||||
|
||||
@@ -33,9 +33,7 @@ const mi_page_t _mi_page_empty = {
|
||||
MI_ATOMIC_VAR_INIT(0), // xthread_free
|
||||
MI_ATOMIC_VAR_INIT(0), // xheap
|
||||
NULL, NULL
|
||||
#if MI_INTPTR_SIZE==8
|
||||
, { 0 } // padding
|
||||
#endif
|
||||
};
|
||||
|
||||
#define MI_PAGE_EMPTY() ((mi_page_t*)&_mi_page_empty)
|
||||
|
||||
Reference in New Issue
Block a user