src: use regular includes

iptables ships with all header files and prioritized its own include
directory over /usr/include/linux, so just use the normal brackets.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c
index eaf861e4b29c7216057ca11a1b6a279742736dd2..09dc5cce4e711f29b76b3f3df44e8450ac6a70f4 100644 (file)
--- a/extensions/libip6t_policy.c
+++ b/extensions/libip6t_policy.c
@@ -14,7 +14,7 @@
 #include <ip6tables.h>
 
 #include <linux/netfilter_ipv6/ip6_tables.h>
-#include "../include/linux/netfilter_ipv6/ip6t_policy.h"
+#include <linux/netfilter_ipv6/ip6t_policy.h>
 
 /*
  * HACK: global pointer to current matchinfo for making

diff --git a/extensions/libipt_CLUSTERIP.c b/extensions/libipt_CLUSTERIP.c
index a0f34060bdb60d46fadc07191a79a2bbc1d1a470..6a2c8da3dbab02350c5b673855c7e489836c944c 100644 (file)
--- a/extensions/libipt_CLUSTERIP.c
+++ b/extensions/libipt_CLUSTERIP.c
@@ -17,7 +17,7 @@
 
 #include <iptables.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
-#include "../include/linux/netfilter_ipv4/ipt_CLUSTERIP.h"
+#include <linux/netfilter_ipv4/ipt_CLUSTERIP.h>
 
 static void CLUSTERIP_help(void)
 {

diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c
index 315479754302e087ff2d568f42d4a4af2e98846d..c0aef9f966206a2470f99c6c8ec5ffbfdd401314 100644 (file)
--- a/extensions/libipt_SAME.c
+++ b/extensions/libipt_SAME.c
@@ -8,7 +8,7 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter/nf_nat.h>
 /* For 64bit kernel / 32bit userspace */
-#include "../include/linux/netfilter_ipv4/ipt_SAME.h"
+#include <linux/netfilter_ipv4/ipt_SAME.h>
 
 /* Function which prints out usage message. */
 static void SAME_help(void)

diff --git a/extensions/libipt_ULOG.c b/extensions/libipt_ULOG.c
index d2b464f2f5a4eda95bf37ecb2fa04aa76e7bd254..33c26ec8945f36f0ba22c5ee16f1430169ee4a4d 100644 (file)
--- a/extensions/libipt_ULOG.c
+++ b/extensions/libipt_ULOG.c
@@ -18,7 +18,7 @@
 #include <iptables.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 /* For 64bit kernel / 32bit userspace */
-#include "../include/linux/netfilter_ipv4/ipt_ULOG.h"
+#include <linux/netfilter_ipv4/ipt_ULOG.h>
 
 
 static void print_groups(unsigned int gmask)

diff --git a/extensions/libipt_policy.c b/extensions/libipt_policy.c
index 71e95dd6cee6bbb9444ecfb5b28781146ca1b258..fc55facc8940aa526d43dfd9d72e0746d7e9487d 100644 (file)
--- a/extensions/libipt_policy.c
+++ b/extensions/libipt_policy.c
@@ -13,7 +13,7 @@
 #include <iptables.h>
 
 #include <linux/netfilter_ipv4/ip_tables.h>
-#include "../include/linux/netfilter_ipv4/ipt_policy.h"
+#include <linux/netfilter_ipv4/ipt_policy.h>
 
 /*
  * HACK: global pointer to current matchinfo for making

diff --git a/extensions/libxt_connlimit.c b/extensions/libxt_connlimit.c
index 3474ce5f897e19bef28593c22110143f3e784cba..7a2fb4520e870a5993c46485ce528a3ab1b75447 100644 (file)
--- a/extensions/libxt_connlimit.c
+++ b/extensions/libxt_connlimit.c
@@ -6,7 +6,7 @@
 #include <stddef.h>
 #include <getopt.h>
 #include <iptables.h>
-#include "../include/linux/netfilter/xt_connlimit.h"
+#include <linux/netfilter/xt_connlimit.h>
 
 static void connlimit_help(void)
 {

diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c
index 424635a15ba1250e0d070b3d2fea179bfbf528eb..a519a1a40ef1dcff2672af282c87b6d2289332d5 100644 (file)
--- a/extensions/libxt_limit.c
+++ b/extensions/libxt_limit.c
@@ -12,7 +12,7 @@
 #include <stddef.h>
 #include <linux/netfilter/x_tables.h>
 /* For 64bit kernel / 32bit userspace */
-#include "../include/linux/netfilter/xt_limit.h"
+#include <linux/netfilter/xt_limit.h>
 
 #define XT_LIMIT_AVG   "3/hour"
 #define XT_LIMIT_BURST 5

diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c
index 3c2ece1af87dbdc51a01a457356efa5751288ede..6efd642800a08fd3510fb482e7518af30d685165 100644 (file)
--- a/extensions/libxt_multiport.c
+++ b/extensions/libxt_multiport.c
@@ -8,8 +8,7 @@
 #include <xtables.h>
 #include <libiptc/libiptc.h>
 #include <libiptc/libip6tc.h>
-/* To ensure that iptables compiles with an old kernel */
-#include "../include/linux/netfilter/xt_multiport.h"
+#include <linux/netfilter/xt_multiport.h>
 
 /* Function which prints out usage message. */
 static void multiport_help(void)

diff --git a/extensions/libxt_u32.c b/extensions/libxt_u32.c
index 3a5cdad6de92c1bdf4851c34f2441810323ecf10..77245ab260506d495cfb8e378a28ec17da126bd2 100644 (file)
--- a/extensions/libxt_u32.c
+++ b/extensions/libxt_u32.c
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include <xtables.h>
-#include "../include/linux/netfilter/xt_u32.h"
+#include <linux/netfilter/xt_u32.h>
 
 static const struct option u32_opts[] = {
        {"u32", 1, NULL, 'u'},