summaryrefslogtreecommitdiff
path: root/src/os.c
diff options
context:
space:
mode:
authorDaan <daanl@outlook.com>2022-02-14 16:16:03 -0800
committerDaan <daanl@outlook.com>2022-02-14 16:16:03 -0800
commite91ee4c3849b2026d153a0331da868be67fa834c (patch)
tree06f353d331675ce64511258c13c3a8cbdfe5b46c /src/os.c
parent8ec83f6945133e299290354ca74f65e906c8b163 (diff)
parent8a1f8a305adb5708935a445ba2a5daf9961a4466 (diff)
Merge branch 'dev' into dev-slice
Diffstat (limited to 'src/os.c')
-rw-r--r--src/os.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/os.c b/src/os.c
index a7cc3ca..e5c5bfc 100644
--- a/src/os.c
+++ b/src/os.c
@@ -300,7 +300,7 @@ static bool mi_os_mem_free(void* addr, size_t size, bool was_committed, mi_stats
}
}
-#if !defined(MI_USE_SBRK) && !defined(__wasi__)
+#if !(defined(__wasi__) || defined(MI_USE_SBRK) || defined(MAP_ALIGNED))
static void* mi_os_get_aligned_hint(size_t try_alignment, size_t size);
#endif
@@ -659,7 +659,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)
+#elif defined(__wasi__) || defined(MI_USE_SBRK) || defined(MAP_ALIGNED)
// no need for mi_os_get_aligned_hint
#else
static void* mi_os_get_aligned_hint(size_t try_alignment, size_t size) {