diff options
author | Daan Leijen <daan@microsoft.com> | 2022-04-09 16:22:10 -0700 |
---|---|---|
committer | Daan Leijen <daan@microsoft.com> | 2022-04-09 16:22:10 -0700 |
commit | a3ced56b1808a42baab4308e76855441eb5bbf1a (patch) | |
tree | ea5f6eaa689d1a2556798e242e2c5e5e98847d5f | |
parent | 0a1d0bbcbf26fd69e5947883a8fd898b6778436b (diff) | |
parent | f4b7ea9e9ee5648975266c532e90ebfc9530045b (diff) |
merge from dev
-rw-r--r-- | src/os.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -336,7 +336,7 @@ static bool mi_os_mem_free(void* addr, size_t size, bool was_committed, mi_stats return !err; } -#if !(defined(__wasi__) || defined(MI_USE_SBRK) || defined(MAP_ALIGNED)) +#if !(defined(__wasi__) || defined(MI_USE_SBRK) || defined(MAP_ALIGNED) || MI_INTPTR_SIZE < 8) static void* mi_os_get_aligned_hint(size_t try_alignment, size_t size); #endif @@ -688,7 +688,7 @@ static void* mi_os_get_aligned_hint(size_t try_alignment, size_t size) if (hint%try_alignment != 0) return NULL; return (void*)hint; } -#elif defined(__wasi__) || defined(MI_USE_SBRK) || defined(MAP_ALIGNED) +#elif defined(__wasi__) || defined(MI_USE_SBRK) || defined(MAP_ALIGNED) || (MI_INTPTR_SIZE < 8) // no need for mi_os_get_aligned_hint #else static void* mi_os_get_aligned_hint(size_t try_alignment, size_t size) { |