From c02e80878979d2205f3d89d05548397871e598e9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 10 Feb 2009 10:40:15 +0100 Subject: libxtables: decouple non-xtables parts from header Signed-off-by: Jan Engelhardt --- include/iptables.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/iptables.h') diff --git a/include/iptables.h b/include/iptables.h index f7ae0cc5..ee769a58 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -4,6 +4,7 @@ #include #include #include +#include #ifndef IPT_SO_GET_REVISION_MATCH /* Old kernel source. */ #define IPT_SO_GET_REVISION_MATCH (IPT_BASE_CTL + 2) -- cgit v1.2.3 From 395e441e20ea9ab7f37122bcfd76fec527fa447b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 10 Feb 2009 10:43:08 +0100 Subject: src: remove iptables_rule_match indirection macro Signed-off-by: Jan Engelhardt --- include/iptables.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/iptables.h') diff --git a/include/iptables.h b/include/iptables.h index ee769a58..74b244ed 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -11,7 +11,6 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #endif /* IPT_SO_GET_REVISION_MATCH Old kernel source */ -#define iptables_rule_match xtables_rule_match #define ipt_tryload xt_tryload extern int line; -- cgit v1.2.3 From ea955480a8ae43aa956ac62e1aab3f9670529819 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 10 Feb 2009 10:43:42 +0100 Subject: src: remove unused ipt_tryload macro Signed-off-by: Jan Engelhardt --- include/iptables.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/iptables.h') diff --git a/include/iptables.h b/include/iptables.h index 74b244ed..963905aa 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -11,8 +11,6 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #endif /* IPT_SO_GET_REVISION_MATCH Old kernel source */ -#define ipt_tryload xt_tryload - extern int line; /* Your shared library should call one of these. */ -- cgit v1.2.3 From c31870f9bebb3d4d082016fcfaf8c2177ae32eb2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 10 Feb 2009 10:48:28 +0100 Subject: libxtables: move compat defines to xtables.c Addendum to commit v1.4.3-rc1-41-g77f48c2 where the macro users got moved. Signed-off-by: Jan Engelhardt --- include/iptables.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include/iptables.h') diff --git a/include/iptables.h b/include/iptables.h index 963905aa..d309059e 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -6,11 +6,6 @@ #include #include -#ifndef IPT_SO_GET_REVISION_MATCH /* Old kernel source. */ -#define IPT_SO_GET_REVISION_MATCH (IPT_BASE_CTL + 2) -#define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) -#endif /* IPT_SO_GET_REVISION_MATCH Old kernel source */ - extern int line; /* Your shared library should call one of these. */ -- cgit v1.2.3 From 47a6fd9ec9891a8040eb8fd6db3c5012c1056061 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 10 Feb 2009 10:51:25 +0100 Subject: src: consolidate duplicate code in iptables/internal.h Signed-off-by: Jan Engelhardt --- include/iptables.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/iptables.h') diff --git a/include/iptables.h b/include/iptables.h index d309059e..f0aa3455 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -6,8 +6,6 @@ #include #include -extern int line; - /* Your shared library should call one of these. */ extern int do_command(int argc, char *argv[], char **table, struct iptc_handle **handle); -- cgit v1.2.3