diff options
author | Daan Leijen <daan@microsoft.com> | 2021-12-18 11:11:54 -0800 |
---|---|---|
committer | Daan Leijen <daan@microsoft.com> | 2021-12-18 11:11:54 -0800 |
commit | 78e2e580f800b08a3dbb6d2eb383a55269a0f862 (patch) | |
tree | 05691b74cf6f938d5bb93c38d7de2c2a30092cb6 /include/mimalloc.h | |
parent | 3d35147aba3463405b09821e66abfc0a1992b4c0 (diff) | |
parent | 89090510bd965ca48a83857eaa6b6e78a951bf7e (diff) |
Merge branch 'dev' into dev-slice
Diffstat (limited to 'include/mimalloc.h')
-rw-r--r-- | include/mimalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mimalloc.h b/include/mimalloc.h index 26a8ac0..0533e73 100644 --- a/include/mimalloc.h +++ b/include/mimalloc.h @@ -166,7 +166,7 @@ mi_decl_export void mi_process_info(size_t* elapsed_msecs, size_t* user_msecs, s // Note that `alignment` always follows `size` for consistency with unaligned // allocation, but unfortunately this differs from `posix_memalign` and `aligned_alloc`. // ------------------------------------------------------------------------------------- -#define MI_ALIGNED_MAX (1024*1024UL) // maximum supported alignment is 1MiB +#define MI_ALIGNMENT_MAX (1024*1024UL) // maximum supported alignment is 1MiB mi_decl_nodiscard mi_decl_export mi_decl_restrict void* mi_malloc_aligned(size_t size, size_t alignment) mi_attr_noexcept mi_attr_malloc mi_attr_alloc_size(1) mi_attr_alloc_align(2); mi_decl_nodiscard mi_decl_export mi_decl_restrict void* mi_malloc_aligned_at(size_t size, size_t alignment, size_t offset) mi_attr_noexcept mi_attr_malloc mi_attr_alloc_size(1); |