mirror of
https://github.com/microsoft/mimalloc.git
synced 2025-05-06 07:29:30 +03:00
Merge branch 'dev' of https://github.com/microsoft/mimalloc into dev
This commit is contained in:
commit
783ae72743
1 changed files with 2 additions and 0 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
|
if (p==MAP_FAILED) p = NULL; // fall back to regular mmap
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
UNUSED(try_alignment);
|
||||||
#endif
|
#endif
|
||||||
if (p==NULL) {
|
if (p==NULL) {
|
||||||
p = mmap(addr,size,protect_flags,flags,fd,0);
|
p = mmap(addr,size,protect_flags,flags,fd,0);
|
||||||
|
|
Loading…
Add table
Reference in a new issue