projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid "inline" in public headers for strict c89 compatibility
[musl]
/
include
/
netinet
/
in.h
diff --git
a/include/netinet/in.h
b/include/netinet/in.h
index
44018f1
..
509640b
100644
(file)
--- a/
include/netinet/in.h
+++ b/
include/netinet/in.h
@@
-1,6
+1,10
@@
#ifndef _NETINET_IN_H
#define _NETINET_IN_H
#ifndef _NETINET_IN_H
#define _NETINET_IN_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define __NEED_in_addr_t
#define __NEED_in_port_t
#define __NEED_sa_family_t
#define __NEED_in_addr_t
#define __NEED_in_port_t
#define __NEED_sa_family_t
@@
-23,10
+27,12
@@
struct in6_addr
{
union {
uint8_t __s6_addr[16];
{
union {
uint8_t __s6_addr[16];
+ uint16_t __s6_addr16[8];
uint32_t __s6_addr32[4];
} __in6_union;
};
#define s6_addr __in6_union.__s6_addr
uint32_t __s6_addr32[4];
} __in6_union;
};
#define s6_addr __in6_union.__s6_addr
+#define s6_addr16 __in6_union.__s6_addr16
#define s6_addr32 __in6_union.__s6_addr32
struct sockaddr_in6
#define s6_addr32 __in6_union.__s6_addr32
struct sockaddr_in6
@@
-132,6
+138,11
@@
uint16_t ntohs(uint16_t);
#define IN6_IS_ADDR_MC_GLOBAL(a) \
(IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0xe))
#define IN6_IS_ADDR_MC_GLOBAL(a) \
(IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0xe))
+#define __ARE_4_EQUAL(a,b) \
+ (!( 0[a]-0[b] | 1[a]-1[b] | 2[a]-2[b] | 3[a]-3[b] ))
+#define IN6_ARE_ADDR_EQUAL(a,b) \
+ __ARE_4_EQUAL((const uint32_t *)(a), (const uint32_t *)(b))
+
#define IN_CLASSA(a) ((((in_addr_t)(a)) & 0x80000000) == 0)
#define IN_CLASSA_NET 0xff000000
#define IN_CLASSA_NSHIFT 24
#define IN_CLASSA(a) ((((in_addr_t)(a)) & 0x80000000) == 0)
#define IN_CLASSA_NET 0xff000000
#define IN_CLASSA_NSHIFT 24
@@
-233,7
+244,7
@@
struct in6_pktinfo
unsigned ipi6_ifindex;
};
unsigned ipi6_ifindex;
};
-struct i
n6_mut
info
+struct i
p6_mtu
info
{
struct sockaddr_in6 ip6m_addr;
uint32_t ip6m_mtu;
{
struct sockaddr_in6 ip6m_addr;
uint32_t ip6m_mtu;
@@
-300,4
+311,8
@@
struct in6_mutinfo
#define IPV6_RTHDR_TYPE_0 0
#define IPV6_RTHDR_TYPE_0 0
+#ifdef __cplusplus
+}
+#endif
+
#endif
#endif