From 6e84c1389518f2a13a99b90f7d4ede39ccd16637 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 9 Dec 2015 19:17:28 -0800 Subject: [PATCH] Update byteswap.h from bionic to match endian.h. Change-Id: I79e445a167800ce083039d0cb65c5a966d7e6a72 --- ndk/platforms/android-21/include/byteswap.h | 9 ++++----- ndk/platforms/android-3/include/byteswap.h | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ndk/platforms/android-21/include/byteswap.h b/ndk/platforms/android-21/include/byteswap.h index 74b0e9180..628fb7f3e 100644 --- a/ndk/platforms/android-21/include/byteswap.h +++ b/ndk/platforms/android-21/include/byteswap.h @@ -28,11 +28,10 @@ #ifndef _BYTESWAP_H_ #define _BYTESWAP_H_ -/* endian.h rather than sys/endian.h so we get the machine-specific file. */ -#include +#include -#define bswap_16(x) swap16(x) -#define bswap_32(x) swap32(x) -#define bswap_64(x) swap64(x) +#define bswap_16(x) __swap16(x) +#define bswap_32(x) __swap32(x) +#define bswap_64(x) __swap64(x) #endif /* _BYTESWAP_H_ */ diff --git a/ndk/platforms/android-3/include/byteswap.h b/ndk/platforms/android-3/include/byteswap.h index 74b0e9180..628fb7f3e 100644 --- a/ndk/platforms/android-3/include/byteswap.h +++ b/ndk/platforms/android-3/include/byteswap.h @@ -28,11 +28,10 @@ #ifndef _BYTESWAP_H_ #define _BYTESWAP_H_ -/* endian.h rather than sys/endian.h so we get the machine-specific file. */ -#include +#include -#define bswap_16(x) swap16(x) -#define bswap_32(x) swap32(x) -#define bswap_64(x) swap64(x) +#define bswap_16(x) __swap16(x) +#define bswap_32(x) __swap32(x) +#define bswap_64(x) __swap64(x) #endif /* _BYTESWAP_H_ */