summaryrefslogtreecommitdiff
path: root/src/common/common_funcs.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/common_funcs.h')
-rw-r--r--src/common/common_funcs.h8
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> {};
28 28
29#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) 29#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
30 30
31#ifndef _WIN32 31#ifndef _MSC_VER
32 32
33#include <errno.h> 33#include <errno.h>
34#ifdef __linux__ 34#ifdef __linux__
@@ -72,7 +72,7 @@ inline u64 _rotr64(u64 x, unsigned int shift){
72 return (x >> n) | (x << (64 - n)); 72 return (x >> n) | (x << (64 - n));
73} 73}
74 74
75#else // WIN32 75#else // _MSC_VER
76// Function Cross-Compatibility 76// Function Cross-Compatibility
77 #define strcasecmp _stricmp 77 #define strcasecmp _stricmp
78 #define strncasecmp _strnicmp 78 #define strncasecmp _strnicmp
@@ -135,7 +135,7 @@ extern "C" {
135} 135}
136 #define Crash() {DebugBreak();} 136 #define Crash() {DebugBreak();}
137 #endif // M_IX86 137 #endif // M_IX86
138#endif // WIN32 ndef 138#endif // _MSC_VER ndef
139 139
140// Dolphin's min and max functions 140// Dolphin's min and max functions
141#undef min 141#undef min
@@ -163,7 +163,7 @@ inline u32 swap24(const u8* _data) {return (_data[0] << 16) | (_data[1] << 8) |
163#undef swap64 163#undef swap64
164#endif 164#endif
165 165
166#ifdef _WIN32 166#ifdef _MSC_VER
167inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);} 167inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);}
168inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);} 168inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);}
169inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);} 169inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);}