diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-31 05:54:02 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-31 05:54:02 +0100 |
| commit | 29da5da9513c0faae0880d2fced18f80ef89923b (patch) | |
| tree | 9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/common/common_funcs.h | |
| parent | Merge pull request #372 from lioncash/warn (diff) | |
| parent | Fix MSVC-related #defines and add CMakeLists comment (diff) | |
| download | yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.gz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.bz2 yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.lz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.xz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.zst yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.zip | |
Diffstat (limited to 'src/common/common_funcs.h')
| -rw-r--r-- | src/common/common_funcs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index ca7abbea6..c2750a63c 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -31,7 +31,7 @@ template<> struct CompileTimeAssert<true> {}; #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) -#ifndef _WIN32 +#ifndef _MSC_VER #include <errno.h> #ifdef __linux__ @@ -75,7 +75,7 @@ inline u64 _rotr64(u64 x, unsigned int shift){ return (x >> n) | (x << (64 - n)); } -#else // WIN32 +#else // _MSC_VER #include <locale.h> // Function Cross-Compatibility @@ -140,7 +140,7 @@ extern "C" { } #define Crash() {DebugBreak();} #endif // M_IX86 -#endif // WIN32 ndef +#endif // _MSC_VER ndef // Dolphin's min and max functions #undef min @@ -168,7 +168,7 @@ inline u32 swap24(const u8* _data) {return (_data[0] << 16) | (_data[1] << 8) | #undef swap64 #endif -#ifdef _WIN32 +#ifdef _MSC_VER inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);} inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);} inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);} |