]> granicus.if.org Git - strace/commitdiff
net.c: include <linux/if_packet.h> unconditionally
authorDmitry V. Levin <ldv@altlinux.org>
Wed, 15 Jun 2016 21:35:48 +0000 (21:35 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Thu, 16 Jun 2016 01:00:24 +0000 (01:00 +0000)
* configure.ac (AC_CHECK_HEADERS): Remove linux/if_packet.h.
* net.c: Include <linux/if_packet.h> unconditionally.

configure.ac
net.c

index d6f72641dfc73a6ea813ad29dc7a472ee1fd2c60..96302808e9f9a620f6786b428c909888e04ce839 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/in6.h linux/if_packet.h],,,
+AC_CHECK_HEADERS([linux/in6.h],,,
 [#include <stddef.h>
 #include <sys/socket.h>
 #include <asm/types.h>])
diff --git a/net.c b/net.c
index 169e702db6e8410c9e8a3b927e5862f2830070e5..8ba5e130572c778c3e8cdba28737a9a5f1fda23c 100644 (file)
--- a/net.c
+++ b/net.c
@@ -68,9 +68,7 @@
 #if defined(HAVE_LINUX_NETFILTER_IPV6_IP6_TABLES_H)
 # include <linux/netfilter_ipv6/ip6_tables.h>
 #endif
-#if defined(HAVE_LINUX_IF_PACKET_H)
-# include <linux/if_packet.h>
-#endif
+#include <linux/if_packet.h>
 #include <linux/icmp.h>
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
 # include <bluetooth/bluetooth.h>