diff options
| author | daan <daanl@outlook.com> | 2021-11-23 19:05:19 -0800 |
|---|---|---|
| committer | daan <daanl@outlook.com> | 2021-11-23 19:05:19 -0800 |
| commit | 5f6246b2cbccba67285c0844fce2cf672d04167f (patch) | |
| tree | a1015204fd9a5e35ed391b1547e34b132e2a42dc /include/mimalloc-internal.h | |
| parent | 03526e55359b34782c8b4ba03de2be5c8b27c160 (diff) | |
| parent | 9183b1eec005be9863e58d51ba0f96b97721d48c (diff) | |
merge from dev
Diffstat (limited to 'include/mimalloc-internal.h')
| -rw-r--r-- | include/mimalloc-internal.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/mimalloc-internal.h b/include/mimalloc-internal.h index 1d998c7..f069230 100644 --- a/include/mimalloc-internal.h +++ b/include/mimalloc-internal.h @@ -21,17 +21,14 @@ terms of the MIT license. A copy of the license can be found in the file #pragma warning(disable:4127) // suppress constant conditional warning (due to MI_SECURE paths) #pragma warning(disable:26812) // unscoped enum warning #define mi_decl_noinline __declspec(noinline) -#define mi_decl_always_inline __forceinline #define mi_decl_thread __declspec(thread) #define mi_decl_cache_align __declspec(align(MI_CACHE_LINE)) #elif (defined(__GNUC__) && (__GNUC__ >= 3)) || defined(__clang__) // includes clang and icc #define mi_decl_noinline __attribute__((noinline)) -#define mi_decl_always_inline __attribute__((always_inline)) #define mi_decl_thread __thread #define mi_decl_cache_align __attribute__((aligned(MI_CACHE_LINE))) #else #define mi_decl_noinline -#define mi_decl_always_inline inline #define mi_decl_thread __thread // hope for the best :-) #define mi_decl_cache_align #endif |