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 --- sysdeps/unix/sysv/linux/bits/in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/bits/in.h') diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h index b80a27fa43..b1d2cf60f3 100644 --- a/sysdeps/unix/sysv/linux/bits/in.h +++ b/sysdeps/unix/sysv/linux/bits/in.h @@ -23,10 +23,10 @@ /* If the application has already included linux/in6.h from a linux-based kernel then we will not define the IPv6 IPPROTO_* defines, in6_addr (nor the - defines), sockaddr_in6, or ipv6_mreq. The ABI used by the linux-kernel and - glibc match exactly. Neither the linux kernel nor glibc should break this - ABI without coordination. */ -#ifdef _UAPI_LINUX_IN6_H + defines), sockaddr_in6, or ipv6_mreq. Same for in6_ptkinfo or ip6_mtuinfo + in linux/ipv6.h. The ABI used by the linux-kernel and glibc match exactly. + Neither the linux kernel nor glibc should break this ABI without coordination. */ +#if defined _UAPI_LINUX_IN6_H || defined _UAPI_IPV6_H /* This is not quite the same API since the kernel always defines s6_addr16 and s6_addr32. This is not a violation of POSIX since POSIX says "at least the following member" and that holds true. */ -- cgit 1.4.1