Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

headers/posix: Use separate naming for the byte-swap macros.

Browse Source 
This avoids a compile error on GCC4 when ByteOrder.h is included
after it.
This commit is contained in:
Augustin Cavalier 2019-03-27 00:24:21 -04:00
parent 86ec5e3bf4
commit 8e309168b9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
headers/posix/netinet/in.h
View File

@ -26,20 +26,22 @@ typedef uint32_t in_addr_t;
* and we are not allowed to import all the BeOS types here. */ * and we are not allowed to import all the BeOS types here. */
#if !defined(__swap_int32) #if !defined(__swap_int32)
# if __GNUC__ >= 4 # if __GNUC__ >= 4
# define __swap_int32(arg) (uint32_t)__builtin_bswap32(arg) # define __net_swap_int32(arg) (uint32_t)__builtin_bswap32(arg)
# define __swap_int16(arg) (uint16_t)__builtin_bswap16(arg) # define __net_swap_int16(arg) (uint16_t)__builtin_bswap16(arg)
# else # else
extern unsigned long __swap_int32(unsigned long); /* private */ extern unsigned long __swap_int32(unsigned long); /* private */
extern uint16_t __swap_int16(uint16_t); /* private */ extern uint16_t __swap_int16(uint16_t); /* private */
# define __net_swap_int32(arg) __swap_int32(arg)
# define __net_swap_int16(arg) __swap_int16(arg)
# endif # endif
#endif #endif
#ifndef htonl #ifndef htonl
# if BYTE_ORDER == LITTLE_ENDIAN # if BYTE_ORDER == LITTLE_ENDIAN
# define htonl(x) ((uint32_t)__swap_int32(x)) # define htonl(x) ((uint32_t)__net_swap_int32(x))
# define ntohl(x) ((uint32_t)__swap_int32(x)) # define ntohl(x) ((uint32_t)__net_swap_int32(x))
# define htons(x) __swap_int16(x) # define htons(x) __net_swap_int16(x)
# define ntohs(x) __swap_int16(x) # define ntohs(x) __net_swap_int16(x)
# elif BYTE_ORDER == BIG_ENDIAN # elif BYTE_ORDER == BIG_ENDIAN
# define htonl(x) (x) # define htonl(x) (x)
# define ntohl(x) (x) # define ntohl(x) (x)