Skip to content

Commit e19c022

Browse files
committed
define mi_decl_align separate from mi_decl_cache_align
1 parent 715acc0 commit e19c022

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

include/mimalloc/internal.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,22 @@ terms of the MIT license. A copy of the license can be found in the file
2727
#define mi_trace_message(...)
2828
#endif
2929

30-
#define MI_CACHE_LINE 64
30+
#define mi_decl_cache_align mi_decl_align(64)
31+
3132
#if defined(_MSC_VER)
3233
#pragma warning(disable:4127) // suppress constant conditional warning (due to MI_SECURE paths)
3334
#pragma warning(disable:26812) // unscoped enum warning
3435
#define mi_decl_noinline __declspec(noinline)
3536
#define mi_decl_thread __declspec(thread)
36-
#define mi_decl_cache_align __declspec(align(MI_CACHE_LINE))
37+
#define mi_decl_align(a) __declspec(align(a))
3738
#define mi_decl_noreturn __declspec(noreturn)
3839
#define mi_decl_weak
3940
#define mi_decl_hidden
4041
#define mi_decl_cold
4142
#elif (defined(__GNUC__) && (__GNUC__ >= 3)) || defined(__clang__) // includes clang and icc
4243
#define mi_decl_noinline __attribute__((noinline))
4344
#define mi_decl_thread __thread
44-
#define mi_decl_cache_align __attribute__((aligned(MI_CACHE_LINE)))
45+
#define mi_decl_align(a) __attribute__((aligned(a)))
4546
#define mi_decl_noreturn __attribute__((noreturn))
4647
#define mi_decl_weak __attribute__((weak))
4748
#define mi_decl_hidden __attribute__((visibility("hidden")))
@@ -53,15 +54,15 @@ terms of the MIT license. A copy of the license can be found in the file
5354
#elif __cplusplus >= 201103L // c++11
5455
#define mi_decl_noinline
5556
#define mi_decl_thread thread_local
56-
#define mi_decl_cache_align alignas(MI_CACHE_LINE)
57+
#define mi_decl_align(a) alignas(a)
5758
#define mi_decl_noreturn [[noreturn]]
5859
#define mi_decl_weak
5960
#define mi_decl_hidden
6061
#define mi_decl_cold
6162
#else
6263
#define mi_decl_noinline
6364
#define mi_decl_thread __thread // hope for the best :-)
64-
#define mi_decl_cache_align
65+
#define mi_decl_align(a)
6566
#define mi_decl_noreturn
6667
#define mi_decl_weak
6768
#define mi_decl_hidden

0 commit comments

Comments
 (0)