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

Merge change 4025

Browse Source 
* 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:
Android (Google) Code Review 2009-06-17 15:36:55 -07:00
commit 4b91ef8348
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libc/include/arpa/inet.h
View File

@ -31,7 +31,6 @@
#include <stdint.h> #include <stdint.h>
#include <sys/types.h> #include <sys/types.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/in6.h>
__BEGIN_DECLS __BEGIN_DECLS

4
libc/include/netinet/in.h
View File

@ -32,6 +32,7 @@
#include <linux/socket.h> #include <linux/socket.h>
#include <linux/in.h> #include <linux/in.h>
#include <linux/in6.h> #include <linux/in6.h>
#include <netinet/in6.h>
__BEGIN_DECLS __BEGIN_DECLS
@ -39,6 +40,9 @@ __BEGIN_DECLS
extern int bindresvport (int sd, struct sockaddr_in *sin); 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 __END_DECLS
#endif /* _NETINET_IN_H_ */ #endif /* _NETINET_IN_H_ */

8
libc/include/netinet/in6.h
View File

@ -90,4 +90,12 @@
#define INET6_ADDRSTRLEN 46 #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 */ #endif /* _NETINET_IN6_H */

1
libc/netbsd/resolv/res_send.c
View File

@ -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 <sys/uio.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/in6.h>
#include "arpa_nameser.h" #include "arpa_nameser.h"
#include <arpa/inet.h> #include <arpa/inet.h>