Merge branch 'dev' into dev-exp

This commit is contained in:
daan 2019-09-02 10:10:08 -07:00
commit d6e35ffd83
4 changed files with 40 additions and 33 deletions

View file

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