diff options
| author |  Yuri Kunde Schlesner | 2015-05-07 15:06:27 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-07 15:06:27 -0700 |
| commit | 52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b (patch) | |
| tree | 352d4e078789f31408c8f8658ba84cc03c08cbcf /src/common/common_funcs.h | |
| parent | Merge pull request #721 from yuriks/more-cleanups (diff) | |
| parent | Common: Add proper macros to test for architecture pointer size (diff) | |
| download | yuzu-52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b.tar.gz yuzu-52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b.tar.xz yuzu-52654842a0fa9b4e17d5f3ed283d6a16f1f8ca2b.zip | |
Merge pull request #724 from citra-emu/arch-misdetection
Common: Add proper macros to test for architecture pointer size
Diffstat (limited to 'src/common/common_funcs.h')
| -rw-r--r-- | src/common/common_funcs.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 4f9e514c9..91b74c6bc 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h | |||
| @@ -34,13 +34,6 @@ | |||
| 34 | #define MEMORY_ALIGNED64(x) __declspec(align(64)) x | 34 | #define MEMORY_ALIGNED64(x) __declspec(align(64)) x |
| 35 | #define MEMORY_ALIGNED128(x) __declspec(align(128)) x | 35 | #define MEMORY_ALIGNED128(x) __declspec(align(128)) x |
| 36 | #else | 36 | #else |
| 37 | // Windows compatibility | ||
| 38 | #ifdef _LP64 | ||
| 39 | #define _M_X64 1 | ||
| 40 | #else | ||
| 41 | #define _M_IX86 1 | ||
| 42 | #endif | ||
| 43 | |||
| 44 | #define __forceinline inline __attribute__((always_inline)) | 37 | #define __forceinline inline __attribute__((always_inline)) |
| 45 | #define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x | 38 | #define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x |
| 46 | #define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x | 39 | #define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x |