Merge pull request #4620 from JosJuice/android-byteswap

Don't use generic byteswapping on Android
2017-01-07 14:01:33 +13:00 · 2017-01-07 14:01:33 +13:00 · 82e003ebb6
parent c380dceb78 5e2b2f059f
commit 82e003ebb6
1 changed files with 1 additions and 3 deletions
--- a/Source/Core/Common/CommonFuncs.h
+++ b/Source/Core/Common/CommonFuncs.h
@ -134,9 +134,7 @@ inline u64 swap64(u64 _data)
 {
  return _byteswap_uint64(_data);
 }
-#elif __linux__ && !(ANDROID && _M_ARM_64)
-// Android NDK r10c has broken builtin byte swap routines
-// Disabled for now.
+#elif __linux__
 inline u16 swap16(u16 _data)
 {
  return bswap_16(_data);