diff options
| author | Qi Wang <interwq@gwu.edu> | 2022-05-06 11:28:25 -0700 |
|---|---|---|
| committer | Qi Wang <interwq@gwu.edu> | 2022-05-06 11:28:25 -0700 |
| commit | 54eaed1d8b56b1aa528be3bdd1877e59c56fa90c (patch) | |
| tree | e79620e0c00b1f8b6b698fbe74df6bae7d812ae2 /include/jemalloc/internal/jemalloc_internal_macros.h | |
| parent | ea6b3e973b477b8061e0076bb257dbd7f3faa756 (diff) | |
| parent | 304c919829f9f340669b61fa64867cfe5dba8021 (diff) | |
| download | jemalloc-master.tar.gz | |
Diffstat (limited to 'include/jemalloc/internal/jemalloc_internal_macros.h')
| -rw-r--r-- | include/jemalloc/internal/jemalloc_internal_macros.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/include/jemalloc/internal/jemalloc_internal_macros.h b/include/jemalloc/internal/jemalloc_internal_macros.h index d8ea06f6..e97b5f90 100644 --- a/include/jemalloc/internal/jemalloc_internal_macros.h +++ b/include/jemalloc/internal/jemalloc_internal_macros.h @@ -4,7 +4,11 @@ #ifdef JEMALLOC_DEBUG # define JEMALLOC_ALWAYS_INLINE static inline #else -# define JEMALLOC_ALWAYS_INLINE JEMALLOC_ATTR(always_inline) static inline +# ifdef _MSC_VER +# define JEMALLOC_ALWAYS_INLINE static __forceinline +# else +# define JEMALLOC_ALWAYS_INLINE JEMALLOC_ATTR(always_inline) static inline +# endif #endif #ifdef _MSC_VER # define inline _inline @@ -40,13 +44,6 @@ #define JEMALLOC_VA_ARGS_HEAD(head, ...) head #define JEMALLOC_VA_ARGS_TAIL(head, ...) __VA_ARGS__ -#if (defined(__GNUC__) || defined(__GNUG__)) && !defined(__clang__) \ - && defined(JEMALLOC_HAVE_ATTR) && (__GNUC__ >= 7) -#define JEMALLOC_FALLTHROUGH JEMALLOC_ATTR(fallthrough); -#else -#define JEMALLOC_FALLTHROUGH /* falls through */ -#endif - /* Diagnostic suppression macros */ #if defined(_MSC_VER) && !defined(__clang__) # define JEMALLOC_DIAGNOSTIC_PUSH __pragma(warning(push)) |