From 85ace9751e9264670d49cbb20fff833e8090d453 Mon Sep 17 00:00:00 2001 From: lioncash Date: Fri, 8 Aug 2014 13:26:26 -0400 Subject: [PATCH] Common: Use the OSX equivalent byte-swap functions --- Source/Core/Common/CommonFuncs.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index 1892aeb3fa..b223198f28 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -11,6 +11,10 @@ #define SLEEP(x) usleep(x*1000) #endif +#ifdef __APPLE__ +#include +#endif + #include #include #include @@ -186,11 +190,11 @@ inline u32 swap32(u32 _data) {return bswap_32(_data);} inline u64 swap64(u64 _data) {return bswap_64(_data);} #elif __APPLE__ inline __attribute__((always_inline)) u16 swap16(u16 _data) - {return (_data >> 8) | (_data << 8);} + {return OSSwapInt16(_data);} inline __attribute__((always_inline)) u32 swap32(u32 _data) - {return __builtin_bswap32(_data);} + {return OSSwapInt32(_data);} inline __attribute__((always_inline)) u64 swap64(u64 _data) - {return __builtin_bswap64(_data);} + {return OSSwapInt64(_data);} #elif __FreeBSD__ inline u16 swap16(u16 _data) {return bswap16(_data);} inline u32 swap32(u32 _data) {return bswap32(_data);}