diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-28 22:00:53 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-28 22:40:05 -0800 |
| commit | 8359f22a288236613e64f2b3e96ef6e2ac2de097 (patch) | |
| tree | 04967bfdadf913d1f8a70ddf5769446d963546dd /include | |
| parent | 5418ef694ee17c698270702d927f04836706e60b (diff) | |
| parent | 8739ed0a9b6597e7106f878ec159a19fe0848f23 (diff) | |
Merge remote branch 'origin/master' into nptl
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/netinet/ether.h | 5 | ||||
| -rw-r--r-- | include/netinet/in.h | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/netinet/ether.h b/include/netinet/ether.h index 5e89dfe9e..c850e3e4f 100644 --- a/include/netinet/ether.h +++ b/include/netinet/ether.h @@ -31,6 +31,7 @@ __BEGIN_DECLS +#if defined __UCLIBC_HAS_IPV4__ || defined __UCLIBC_HAS_IPV6__ /* Convert 48 bit Ethernet ADDRess to ASCII. */ extern char *ether_ntoa (__const struct ether_addr *__addr) __THROW; extern char *ether_ntoa_r (__const struct ether_addr *__addr, char *__buf) @@ -42,8 +43,10 @@ extern struct ether_addr *ether_aton (__const char *__asc) __THROW; extern struct ether_addr *ether_aton_r (__const char *__asc, struct ether_addr *__addr) __THROW; libc_hidden_proto(ether_aton_r) +#endif -#if 0 +#if defined __UCLIBC_HAS_SOCKET__ || defined __UCLIBC_HAS_IPV4__ || \ + defined __UCLIBC_HAS_IPV6__ /* Map 48 bit Ethernet number ADDR to HOSTNAME. */ extern int ether_ntohost (char *__hostname, __const struct ether_addr *__addr) __THROW; diff --git a/include/netinet/in.h b/include/netinet/in.h index 06965d65b..6327001ee 100644 --- a/include/netinet/in.h +++ b/include/netinet/in.h @@ -476,7 +476,7 @@ extern int bindresvport6 (int __sockfd, struct sockaddr_in6 *__sock_in) && ((((__const uint8_t *) (a))[1] & 0xf) == 0xe)) -#if 0 /*def __USE_GNU*/ +#if defined __USE_GNU && defined __UCLIBC_HAS_IPV6__ /* IPv6 packet information. */ struct in6_pktinfo { @@ -490,7 +490,8 @@ struct ip6_mtuinfo struct sockaddr_in6 ip6m_addr; /* dst address including zone ID */ uint32_t ip6m_mtu; /* path MTU in host byte order */ }; - +#endif +#if 0 /*def __USE_GNU*/ /* Obsolete hop-by-hop and Destination Options Processing (RFC 2292). */ extern int inet6_option_space (int __nbytes) |