generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Move BSD stuff together in <sys/endian.h>."

Browse Source
This commit is contained in:
Elliott Hughes 2014-12-10 04:16:55 +00:00 committed by Gerrit Code Review
commit 3592743f71
1 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
libc/include/sys/endian.h
View File

@ -35,13 +35,6 @@
#define _BYTE_ORDER _LITTLE_ENDIAN #define _BYTE_ORDER _LITTLE_ENDIAN
#define __LITTLE_ENDIAN_BITFIELD #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 #ifndef __LITTLE_ENDIAN
#define __LITTLE_ENDIAN _LITTLE_ENDIAN #define __LITTLE_ENDIAN _LITTLE_ENDIAN
#endif #endif
@ -54,27 +47,6 @@
#define __swap32 __builtin_bswap32 #define __swap32 __builtin_bswap32
#define __swap64 __builtin_bswap64 #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. */ /* glibc compatibility. */
__BEGIN_DECLS __BEGIN_DECLS
uint32_t htonl(uint32_t) __pure2; uint32_t htonl(uint32_t) __pure2;
@ -93,13 +65,34 @@ __END_DECLS
#define ntohq(x) __swap64(x) #define ntohq(x) __swap64(x)
#if __BSD_VISIBLE #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 NTOHL(x) (x) = ntohl((u_int32_t)(x))
#define NTOHS(x) (x) = ntohs((u_int16_t)(x)) #define NTOHS(x) (x) = ntohs((u_int16_t)(x))
#define HTONL(x) (x) = htonl((u_int32_t)(x)) #define HTONL(x) (x) = htonl((u_int32_t)(x))
#define HTONS(x) (x) = htons((u_int16_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. * glibc-compatible beXXtoh/leXXtoh synonyms for htobeXX/htoleXX.
* The BSDs export both sets of names, bionic historically only * The BSDs export both sets of names, bionic historically only
@ -112,6 +105,6 @@ __END_DECLS
#define le16toh(x) htole16(x) #define le16toh(x) htole16(x)
#define le32toh(x) htole32(x) #define le32toh(x) htole32(x)
#define le64toh(x) htole64(x) #define le64toh(x) htole64(x)
#endif #endif /* __BSD_VISIBLE */
#endif /* _SYS_ENDIAN_H_ */ #endif /* _SYS_ENDIAN_H_ */