diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-03-09 20:08:38 -0800 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-03-09 20:08:38 -0800 |
| commit | 305e63d9eafb74774cb3d390eea0da74a64665d7 (patch) | |
| tree | 234a7facd4f953885d195d3c44d5f77f3cddcb14 /src/common/common_funcs.h | |
| parent | 3475808a54d55f59e66af1a8aa1ee1c73fcffce7 (diff) | |
| parent | 88d604383e63aab9a33300523c7d95a050f8bb2c (diff) | |
Merge pull request #1475 from lioncash/align
Common: Get rid of alignment macros
Diffstat (limited to 'src/common/common_funcs.h')
| -rw-r--r-- | src/common/common_funcs.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index ed20c3629..aa6aff7b9 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -18,19 +18,11 @@ #define INSERT_PADDING_BYTES(num_bytes) u8 CONCAT2(pad, __LINE__)[(num_bytes)] #define INSERT_PADDING_WORDS(num_words) u32 CONCAT2(pad, __LINE__)[(num_words)] +// Inlining #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 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 - #define MEMORY_ALIGNED128(x) __attribute__((aligned(128))) x #endif #ifndef _MSC_VER |