From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 15 Jun 2016 21:27:41 +0000 (+0000)
Subject: net.c: include <linux/icmp.h> unconditionally
X-Git-Tag: v4.13~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d06010b3c4b96abf050e3d03c9ad99af85ef1e4b;p=strace

net.c: include <linux/icmp.h> unconditionally

* configure.ac (AC_CHECK_HEADERS): Remove linux/icmp.h.
* net.c: Follow the example of tests/net-icmp_filter.c and include
<linux/icmp.h> unconditionally.
---

diff --git a/configure.ac b/configure.ac
index 2f699c8c..d6f72641 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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/if_packet.h],,,
+AC_CHECK_HEADERS([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 14991164..9c4af0d5 100644
--- a/net.c
+++ b/net.c
@@ -71,9 +71,7 @@
 #if defined(HAVE_LINUX_IF_PACKET_H)
 # include <linux/if_packet.h>
 #endif
-#if defined(HAVE_LINUX_ICMP_H)
-# include <linux/icmp.h>
-#endif
+#include <linux/icmp.h>
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
 # include <bluetooth/bluetooth.h>
 # include <bluetooth/hci.h>