From 824f914caeb0a186557720a9c3a66e5b21880482 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 9 Dec 2014 19:44:42 -0800 Subject: Move BSD stuff together in . Change-Id: I8bb511840f3cd98d5008034e405d82e923bd3203 --- libc/include/sys/endian.h | 55 +++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) (limited to 'libc') diff --git a/libc/include/sys/endian.h b/libc/include/sys/endian.h index c62ba7f2a..2fd480dc2 100644 --- a/libc/include/sys/endian.h +++ b/libc/include/sys/endian.h @@ -35,13 +35,6 @@ #define _BYTE_ORDER _LITTLE_ENDIAN #define __LITTLE_ENDIAN_BITFIELD -#if __BSD_VISIBLE -#define LITTLE_ENDIAN _LITTLE_ENDIAN -#define BIG_ENDIAN _BIG_ENDIAN -#define PDP_ENDIAN _PDP_ENDIAN -#define BYTE_ORDER _BYTE_ORDER -#endif - #ifndef __LITTLE_ENDIAN #define __LITTLE_ENDIAN _LITTLE_ENDIAN #endif @@ -54,27 +47,6 @@ #define __swap32 __builtin_bswap32 #define __swap64 __builtin_bswap64 -#if __BSD_VISIBLE -#define swap16 __swap16 -#define swap32 __swap32 -#define swap64 __swap64 -#define swap16_multi __swap16_multi - -#define htobe16 __swap16 -#define htobe32 __swap32 -#define htobe64 __swap64 -#define betoh16 __swap16 -#define betoh32 __swap32 -#define betoh64 __swap64 - -#define htole16(x) (x) -#define htole32(x) (x) -#define htole64(x) (x) -#define letoh16(x) (x) -#define letoh32(x) (x) -#define letoh64(x) (x) -#endif /* __BSD_VISIBLE */ - /* glibc compatibility. */ __BEGIN_DECLS uint32_t htonl(uint32_t) __pure2; @@ -93,13 +65,34 @@ __END_DECLS #define ntohq(x) __swap64(x) #if __BSD_VISIBLE +#define LITTLE_ENDIAN _LITTLE_ENDIAN +#define BIG_ENDIAN _BIG_ENDIAN +#define PDP_ENDIAN _PDP_ENDIAN +#define BYTE_ORDER _BYTE_ORDER + #define NTOHL(x) (x) = ntohl((u_int32_t)(x)) #define NTOHS(x) (x) = ntohs((u_int16_t)(x)) #define HTONL(x) (x) = htonl((u_int32_t)(x)) #define HTONS(x) (x) = htons((u_int16_t)(x)) -#endif -#ifdef __BSD_VISIBLE +#define swap16 __swap16 +#define swap32 __swap32 +#define swap64 __swap64 + +#define htobe16 __swap16 +#define htobe32 __swap32 +#define htobe64 __swap64 +#define betoh16 __swap16 +#define betoh32 __swap32 +#define betoh64 __swap64 + +#define htole16(x) (x) +#define htole32(x) (x) +#define htole64(x) (x) +#define letoh16(x) (x) +#define letoh32(x) (x) +#define letoh64(x) (x) + /* * glibc-compatible beXXtoh/leXXtoh synonyms for htobeXX/htoleXX. * The BSDs export both sets of names, bionic historically only @@ -112,6 +105,6 @@ __END_DECLS #define le16toh(x) htole16(x) #define le32toh(x) htole32(x) #define le64toh(x) htole64(x) -#endif +#endif /* __BSD_VISIBLE */ #endif /* _SYS_ENDIAN_H_ */ -- cgit v1.2.3