Merge change 4025
* changes: Make IPv6 definitions comply with RFC 3493: - Add some definitions to netinet/in6.h - Include netinet/in6.h from netinet/in.h
This commit is contained in:
commit
4b91ef8348
|
@ -31,7 +31,6 @@
|
|||
#include <stdint.h>
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in6.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
#include <linux/socket.h>
|
||||
#include <linux/in.h>
|
||||
#include <linux/in6.h>
|
||||
#include <netinet/in6.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
|
@ -39,6 +40,9 @@ __BEGIN_DECLS
|
|||
|
||||
extern int bindresvport (int sd, struct sockaddr_in *sin);
|
||||
|
||||
static const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
|
||||
static const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* _NETINET_IN_H_ */
|
||||
|
|
|
@ -90,4 +90,12 @@
|
|||
|
||||
#define INET6_ADDRSTRLEN 46
|
||||
|
||||
#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
|
||||
#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP
|
||||
|
||||
#define IN6ADDR_ANY_INIT {{{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}}
|
||||
|
||||
#define ipv6mr_interface ipv6mr_ifindex
|
||||
|
||||
|
||||
#endif /* _NETINET_IN6_H */
|
||||
|
|
|
@ -95,7 +95,6 @@ __RCSID("$NetBSD: res_send.c,v 1.9 2006/01/24 17:41:25 christos Exp $");
|
|||
#include <sys/uio.h>
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in6.h>
|
||||
#include "arpa_nameser.h"
|
||||
#include <arpa/inet.h>
|
||||
|
||||
|
|
Loading…
Reference in New Issue