diff options
| author |  ShizZy | 2013-10-01 19:05:33 -0400 |
|---|---|---|
| committer | ShizZy | 2013-10-01 19:05:33 -0400 |
| commit | eab69534c6fe9075374952a9e51d08516640b504 (patch) | |
| tree | d2ca25f71135d18f56ad3d3ac608be8c7c02ca16 /src | |
| parent | upgraded proj files to vs 2013 (diff) | |
| download | yuzu-eab69534c6fe9075374952a9e51d08516640b504.tar.gz yuzu-eab69534c6fe9075374952a9e51d08516640b504.tar.xz yuzu-eab69534c6fe9075374952a9e51d08516640b504.zip | |
renamed GC_ALIGNED* macros to MEMORY_ALIGNED*
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/src/common.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/common/src/common.h b/src/common/src/common.h index 0e5bf1cd3..0f2c34727 100644 --- a/src/common/src/common.h +++ b/src/common/src/common.h | |||
| @@ -71,12 +71,12 @@ private: | |||
| 71 | #define CHECK_HEAP_INTEGRITY() | 71 | #define CHECK_HEAP_INTEGRITY() |
| 72 | 72 | ||
| 73 | // Alignment | 73 | // Alignment |
| 74 | #define GC_ALIGNED16(x) __declspec(align(16)) x | 74 | #define MEMORY_ALIGNED16(x) __declspec(align(16)) x |
| 75 | #define GC_ALIGNED32(x) __declspec(align(32)) x | 75 | #define MEMORY_ALIGNED32(x) __declspec(align(32)) x |
| 76 | #define GC_ALIGNED64(x) __declspec(align(64)) x | 76 | #define MEMORY_ALIGNED64(x) __declspec(align(64)) x |
| 77 | #define GC_ALIGNED128(x) __declspec(align(128)) x | 77 | #define MEMORY_ALIGNED128(x) __declspec(align(128)) x |
| 78 | #define GC_ALIGNED16_DECL(x) __declspec(align(16)) x | 78 | #define MEMORY_ALIGNED16_DECL(x) __declspec(align(16)) x |
| 79 | #define GC_ALIGNED64_DECL(x) __declspec(align(64)) x | 79 | #define MEMORY_ALIGNED64_DECL(x) __declspec(align(64)) x |
| 80 | 80 | ||
| 81 | // Since they are always around on windows | 81 | // Since they are always around on windows |
| 82 | #define HAVE_WX 1 | 82 | #define HAVE_WX 1 |
| @@ -108,12 +108,12 @@ private: | |||
| 108 | #define _M_IX86 1 | 108 | #define _M_IX86 1 |
| 109 | #endif | 109 | #endif |
| 110 | #define __forceinline inline __attribute__((always_inline)) | 110 | #define __forceinline inline __attribute__((always_inline)) |
| 111 | #define GC_ALIGNED16(x) __attribute__((aligned(16))) x | 111 | #define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x |
| 112 | #define GC_ALIGNED32(x) __attribute__((aligned(32))) x | 112 | #define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x |
| 113 | #define GC_ALIGNED64(x) __attribute__((aligned(64))) x | 113 | #define MEMORY_ALIGNED64(x) __attribute__((aligned(64))) x |
| 114 | #define GC_ALIGNED128(x) __attribute__((aligned(128))) x | 114 | #define MEMORY_ALIGNED128(x) __attribute__((aligned(128))) x |
| 115 | #define GC_ALIGNED16_DECL(x) __attribute__((aligned(16))) x | 115 | #define MEMORY_ALIGNED16_DECL(x) __attribute__((aligned(16))) x |
| 116 | #define GC_ALIGNED64_DECL(x) __attribute__((aligned(64))) x | 116 | #define MEMORY_ALIGNED64_DECL(x) __attribute__((aligned(64))) x |
| 117 | #endif | 117 | #endif |
| 118 | 118 | ||
| 119 | #ifdef _MSC_VER | 119 | #ifdef _MSC_VER |