diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 03:59:59 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 04:50:08 +0200 |
| commit | bf12f270b3c74f694c789a57cc69f414753ca080 (patch) | |
| tree | a80e6ee9863a46966fe43496f1ccbbfa07cc98aa /src/common/common.h | |
| parent | Clean-up includes (diff) | |
| download | yuzu-bf12f270b3c74f694c789a57cc69f414753ca080.tar yuzu-bf12f270b3c74f694c789a57cc69f414753ca080.tar.gz yuzu-bf12f270b3c74f694c789a57cc69f414753ca080.tar.bz2 yuzu-bf12f270b3c74f694c789a57cc69f414753ca080.tar.lz yuzu-bf12f270b3c74f694c789a57cc69f414753ca080.tar.xz yuzu-bf12f270b3c74f694c789a57cc69f414753ca080.tar.zst yuzu-bf12f270b3c74f694c789a57cc69f414753ca080.zip | |
Diffstat (limited to 'src/common/common.h')
| -rw-r--r-- | src/common/common.h | 43 |
1 files changed, 5 insertions, 38 deletions
diff --git a/src/common/common.h b/src/common/common.h index a4a403fb9..00d1d14f9 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -11,8 +11,6 @@ #include <cstdio> #include <cstring> -#define STACKALIGN - #include "common/assert.h" #include "common/logging/log.h" #include "common/common_types.h" @@ -20,56 +18,25 @@ #include "common/common_paths.h" #include "common/platform.h" -#ifdef __APPLE__ -// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. -// This is only needed on i386 gcc - x86_64 already aligns to 16 bytes. - #if defined __i386__ && defined __GNUC__ - #undef STACKALIGN - #define STACKALIGN __attribute__((__force_align_arg_pointer__)) - #endif -#elif defined _WIN32 -// Check MSC ver - #if defined _MSC_VER && _MSC_VER <= 1000 - #error needs at least version 1000 of MSC - #endif - - #ifndef NOMINMAX - #define NOMINMAX - #endif - -// Alignment +#ifdef _WIN32 + // Alignment #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 - #define MEMORY_ALIGNED16_DECL(x) __declspec(align(16)) x - #define MEMORY_ALIGNED64_DECL(x) __declspec(align(64)) x -#endif - -// Windows compatibility -#ifndef _WIN32 +#else + // Windows compatibility #ifdef _LP64 #define _M_X64 1 #else #define _M_IX86 1 #endif + #define __forceinline 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 - #define MEMORY_ALIGNED16_DECL(x) __attribute__((aligned(16))) x - #define MEMORY_ALIGNED64_DECL(x) __attribute__((aligned(64))) x -#endif - -#ifdef _MSC_VER - #define __strdup _strdup - #define __getcwd _getcwd - #define __chdir _chdir -#else - #define __strdup strdup - #define __getcwd getcwd - #define __chdir chdir #endif #if defined _M_GENERIC |