kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-07-07 03:48:42 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge from dev, bump version to v2.1.7

Browse source
This commit is contained in:
Daan 2024-05-16 19:07:14 -07:00
commit 69f81732f8
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/arena.c
View file

@ -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

2
src/init.c
View file

@ -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)