diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-08-12 00:17:05 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-08-12 00:17:05 -0400 |
| commit | 6ba619f225399eb7dc66fcab8e2ad7d1c8ab4788 (patch) | |
| tree | cb108d168ea296d798b99cac1faff36b9ecbe4e1 /src/common/common_funcs.h | |
| parent | 35f336066354bd667524d99439a5e792ae7e7366 (diff) | |
| parent | d1ae413ffd4f6a1d36ab67ee8d85c770336e0af3 (diff) | |
Merge pull request #1030 from archshift/force-inline
Stop defining GCC always_inline attributes as __forceinline
Diffstat (limited to 'src/common/common_funcs.h')
| -rw-r--r-- | src/common/common_funcs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 59bd16db..83b47f61 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -20,12 +20,13 @@ #ifdef _WIN32 // Alignment + #define FORCE_INLINE __forceinline #define MEMORY_ALIGNED16(x) __declspec(align(16)) x #define MEMORY_ALIGNED32(x) __declspec(align(32)) x #define MEMORY_ALIGNED64(x) __declspec(align(64)) x #define MEMORY_ALIGNED128(x) __declspec(align(128)) x #else - #define __forceinline inline __attribute__((always_inline)) + #define FORCE_INLINE inline __attribute__((always_inline)) #define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x #define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x #define MEMORY_ALIGNED64(x) __attribute__((aligned(64))) x |