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 ca7abbea6..c2750a63c 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -31,7 +31,7 @@ template<> struct CompileTimeAssert<true> {};
31 31
32#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) 32#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
33 33
34#ifndef _WIN32 34#ifndef _MSC_VER
35 35
36#include <errno.h> 36#include <errno.h>
37#ifdef __linux__ 37#ifdef __linux__
@@ -75,7 +75,7 @@ inline u64 _rotr64(u64 x, unsigned int shift){
75 return (x >> n) | (x << (64 - n)); 75 return (x >> n) | (x << (64 - n));
76} 76}
77 77
78#else // WIN32 78#else // _MSC_VER
79#include <locale.h> 79#include <locale.h>
80 80
81// Function Cross-Compatibility 81// Function Cross-Compatibility
@@ -140,7 +140,7 @@ extern "C" {
140} 140}
141 #define Crash() {DebugBreak();} 141 #define Crash() {DebugBreak();}
142 #endif // M_IX86 142 #endif // M_IX86
143#endif // WIN32 ndef 143#endif // _MSC_VER ndef
144 144
145// Dolphin's min and max functions 145// Dolphin's min and max functions
146#undef min 146#undef min
@@ -168,7 +168,7 @@ inline u32 swap24(const u8* _data) {return (_data[0] << 16) | (_data[1] << 8) |
168#undef swap64 168#undef swap64
169#endif 169#endif
170 170
171#ifdef _WIN32 171#ifdef _MSC_VER
172inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);} 172inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);}
173inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);} 173inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);}
174inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);} 174inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);}