From cb43bb0d68f001fc3d6e054d712ab8794b5fd1de Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Tue, 6 Jan 2015 16:13:19 -0800 Subject: in.h: Coordinate in6_pktinfo and ip6_mtuinfo for kernel and glibc [BZ #15850] Similarly to what we did for in6_addr, we need a macro to guard in6_pktinfo and ip6_mtuinfo too. Cc: Carlos O'Donell Signed-off-by: Cong Wang --- inet/netinet/in.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'inet') diff --git a/inet/netinet/in.h b/inet/netinet/in.h index bf3c8b1730..f541c5809d 100644 --- a/inet/netinet/in.h +++ b/inet/netinet/in.h @@ -530,6 +530,7 @@ extern int bindresvport6 (int __sockfd, struct sockaddr_in6 *__sock_in) #ifdef __USE_GNU struct cmsghdr; /* Forward declaration. */ +#ifndef __USE_KERNEL_IPV6_DEFS /* IPv6 packet information. */ struct in6_pktinfo { @@ -543,7 +544,7 @@ struct ip6_mtuinfo struct sockaddr_in6 ip6m_addr; /* dst address including zone ID */ uint32_t ip6m_mtu; /* path MTU in host byte order */ }; - +#endif /* !__USE_KERNEL_IPV6_DEFS */ /* Obsolete hop-by-hop and Destination Options Processing (RFC 2292). */ extern int inet6_option_space (int __nbytes) -- cgit v1.2.3