ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix GCC 4.8 compiling. GCC 4.8 now defines _rotl/_rotr/_lrotl/_lrotr.

This commit is contained in:
Ryan Houdek 2013-04-03 10:52:06 -05:00
parent 3fdc46877a
commit b5676fe82b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/Src/CommonFuncs.h
View File

@ -66,7 +66,11 @@ _mm_shuffle_epi8(__m128i a, __m128i mask)
#define Crash() {asm ("int $3");}
#endif
#define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0]))
// GCC 4.8 defines all the rotate functions now
#ifdef _rotl
#define _rotl64 _lrotl
#define _rotr64 _lrotr
#else
inline u32 _rotl(u32 x, int shift) {
shift &= 31;
if (!shift) return x;
@ -88,6 +92,7 @@ inline u64 _rotr64(u64 x, unsigned int shift){
unsigned int n = shift % 64;
return (x >> n) | (x << (64 - n));
}
#endif
#else // WIN32
// Function Cross-Compatibility