]> granicus.if.org Git - strace/commitdiff
net.c: include <linux/netlink.h> unconditionally
authorDmitry V. Levin <ldv@altlinux.org>
Tue, 14 Jun 2016 13:53:47 +0000 (13:53 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Tue, 14 Jun 2016 13:53:47 +0000 (13:53 +0000)
* configure.ac (AC_CHECK_HEADERS): Remove linux/netlink.h.
* net.c: Follow the example of socketutils.c and include
<linux/netlink.h> unconditionally.

configure.ac
net.c

index b505d9924ea67e4d9dc254027cfa5ea8e66ec19b..2f699c8c53e43ef120bd85edd62f71d69a75250c 100644 (file)
@@ -414,7 +414,7 @@ AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
 
 AC_CHECK_HEADERS([linux/mqueue.h],,, [#include <linux/types.h>])
 
-AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],,,
+AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/if_packet.h],,,
 [#include <stddef.h>
 #include <sys/socket.h>
 #include <asm/types.h>])
diff --git a/net.c b/net.c
index 8cc97da1c3e2adcb3e7d0f3eb53ea55f55ef7f8d..2155eb57924fbebd93762b1d3e8c67917dbd0c91 100644 (file)
--- a/net.c
+++ b/net.c
@@ -55,9 +55,7 @@
 #if defined(HAVE_LINUX_IP_VS_H)
 # include <linux/ip_vs.h>
 #endif
-#if defined(HAVE_LINUX_NETLINK_H)
-# include <linux/netlink.h>
-#endif
+#include <linux/netlink.h>
 #if defined(HAVE_LINUX_NETFILTER_ARP_ARP_TABLES_H)
 # include <linux/netfilter_arp/arp_tables.h>
 #endif