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

Merge pull request #4620 from JosJuice/android-byteswap 

Don't use generic byteswapping on Android
This commit is contained in:
Matthew Parlane 2017-01-07 14:01:33 +13:00 committed by GitHub
parent c380dceb78 5e2b2f059f
commit 82e003ebb6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/CommonFuncs.h
View File

@ -134,9 +134,7 @@ inline u64 swap64(u64 _data)
{ {
return _byteswap_uint64(_data); return _byteswap_uint64(_data);
} }
#elif __linux__ && !(ANDROID && _M_ARM_64) #elif __linux__
// Android NDK r10c has broken builtin byte swap routines
// Disabled for now.
inline u16 swap16(u16 _data) inline u16 swap16(u16 _data)
{ {
return bswap_16(_data); return bswap_16(_data);