diff options
| author | darkf <lw9k123@gmail.com> | 2014-11-29 06:38:20 +0100 |
|---|---|---|
| committer | darkf <lw9k123@gmail.com> | 2014-11-29 06:38:20 +0100 |
| commit | 459502e48ccb6607e531112e7ae89f62b75023c8 (patch) | |
| tree | 491c2a24f1496d4abab0d3339e559b9facc74265 /src/common/common_funcs.h | |
| parent | Merge pull request #223 from linkmauve/remove-thread (diff) | |
| download | yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.gz yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.bz2 yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.lz yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.xz yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.zst yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.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 d84ec4c42..ddf3958cc 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -28,7 +28,7 @@ template<> struct CompileTimeAssert<true> {}; #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) -#ifndef _WIN32 +#ifndef _MSC_VER #include <errno.h> #ifdef __linux__ @@ -72,7 +72,7 @@ inline u64 _rotr64(u64 x, unsigned int shift){ return (x >> n) | (x << (64 - n)); } -#else // WIN32 +#else // _MSC_VER // Function Cross-Compatibility #define strcasecmp _stricmp #define strncasecmp _strnicmp @@ -135,7 +135,7 @@ extern "C" { } #define Crash() {DebugBreak();} #endif // M_IX86 -#endif // WIN32 ndef +#endif // _MSC_VER ndef // Dolphin's min and max functions #undef min @@ -163,7 +163,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);} |