summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2017-01-06 13:56:53 +0100
committerJosJuice <josjuice@gmail.com>2017-01-06 13:56:53 +0100
commit5e2b2f059fc86a843670d3ad0180bb61efb1af2c (patch)
treefaf31b1fd4bb568687adf0d5eb5084371e7e48e7
parente7359f247b553d8ff3b5e0e10f8be86e9d9f6172 (diff)
Don't use generic byteswapping on Android
This seems to work fine nowadays.
-rw-r--r--Source/Core/Common/CommonFuncs.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h
index f46b72686d..4dc359ee3c 100644
--- 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);