diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2014-02-12 09:56:15 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2014-02-12 09:56:15 -0800 |
| commit | 83730db928b303bc3e9f7bd35c2e64cd85ab0267 (patch) | |
| tree | b383a3263acc13360ab4e6f9c3ac5d5f85888d2b /com32/include/netinet/in.h | |
| parent | 9376eaf8582bcec4aebd697d33836f0d180aee13 (diff) | |
| parent | 5de463f724da515fd6c5ea49ded6dde178362181 (diff) | |
| download | syslinux-83730db928b303bc3e9f7bd35c2e64cd85ab0267.tar.gz syslinux-83730db928b303bc3e9f7bd35c2e64cd85ab0267.tar.xz syslinux-83730db928b303bc3e9f7bd35c2e64cd85ab0267.zip | |
Merge remote-tracking branch 'origin/rockridge'
Resolved Conflicts:
com32/include/byteswap.h
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/include/netinet/in.h')
| -rw-r--r-- | com32/include/netinet/in.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/com32/include/netinet/in.h b/com32/include/netinet/in.h index b24f8046..0a0049fd 100644 --- a/com32/include/netinet/in.h +++ b/com32/include/netinet/in.h @@ -8,12 +8,12 @@ #include <stdint.h> #include <byteswap.h> -#define htons(x) bswap_16(x) -#define ntohs(x) bswap_16(x) -#define htonl(x) bswap_32(x) -#define ntohl(x) bswap_32(x) -#define htonq(x) bswap_64(x) -#define ntohq(x) bswap_64(x) +#define htons(x) cpu_to_be16(x) +#define ntohs(x) be16_to_cpu(x) +#define htonl(x) cpu_to_be32(x) +#define ntohl(x) be32_to_cpu(x) +#define htonq(x) cpu_to_be64(x) +#define ntohq(x) be64_to_cpu(x) typedef uint32_t in_addr_t; typedef uint16_t in_port_t; |