mirror of
https://github.com/microsoft/mimalloc.git
synced 2025-07-06 19:38:41 +03:00
Merge branch 'dev' into dev-exp
This commit is contained in:
commit
d6e35ffd83
4 changed files with 40 additions and 33 deletions
2
src/os.c
2
src/os.c
|
@ -306,6 +306,8 @@ static void* mi_unix_mmapx(void* addr, size_t size, size_t try_alignment, int pr
|
|||
if (p==MAP_FAILED) p = NULL; // fall back to regular mmap
|
||||
}
|
||||
}
|
||||
#else
|
||||
UNUSED(try_alignment);
|
||||
#endif
|
||||
if (p==NULL) {
|
||||
p = mmap(addr,size,protect_flags,flags,fd,0);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue