From 836c52da5f3890a52b43ed1ce7e88a68a1ac0d07 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Tue, 14 Feb 2017 11:55:09 +0200 Subject: nhrpd: workaround old kernel vs. glibc definition conflics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes https://bugzilla.quagga.net/show_bug.cgi?id=908 With kernel-headers-3.10.0 we have: In file included from netlink_gre.c:15:0: /usr/include/linux/ipv6.h:19:8: error: redefinition of 'struct in6_pktinfo' struct in6_pktinfo { ^ In file included from netlink_gre.c:10:0: /usr/include/netinet/in.h:536:8: note: originally defined here struct in6_pktinfo ^ In file included from netlink_gre.c:15:0: /usr/include/linux/ipv6.h:24:8: error: redefinition of 'struct ip6_mtuinfo' struct ip6_mtuinfo { ^ In file included from netlink_gre.c:10:0: /usr/include/netinet/in.h:543:8: note: originally defined here struct ip6_mtuinfo So instead of libc's netinet/in.h include kernel's linux/in.h and the add sys/socket.h for struct sockaddr since it does not seem to be defined in kernel headers. Signed-off-by: Timo Teräs Signed-off-by: David Lamparter --- nhrpd/netlink_gre.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nhrpd/netlink_gre.c') diff --git a/nhrpd/netlink_gre.c b/nhrpd/netlink_gre.c index 7cd30aa30..93998dc5f 100644 --- a/nhrpd/netlink_gre.c +++ b/nhrpd/netlink_gre.c @@ -7,9 +7,10 @@ * (at your option) any later version. */ -#include +#include #include #include +#include #include #include #include -- cgit v1.2.3