From: Jan Engelhardt <jengelh@medozas.de>
Date: Tue, 10 Feb 2009 09:48:28 +0000 (+0100)
Subject: libxtables: move compat defines to xtables.c
X-Git-Tag: v1.4.3~39^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c31870f9bebb3d4d082016fcfaf8c2177ae32eb2;p=thirdparty%2Fiptables.git

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 <jengelh@medozas.de>
---

diff --git a/include/ip6tables.h b/include/ip6tables.h
index b8478d40..98f2da5c 100644
--- a/include/ip6tables.h
+++ b/include/ip6tables.h
@@ -6,11 +6,6 @@
 #include <libiptc/libip6tc.h>
 #include <iptables/internal.h>
 
-#ifndef IP6T_SO_GET_REVISION_MATCH /* Old kernel source. */
-#define IP6T_SO_GET_REVISION_MATCH	68
-#define IP6T_SO_GET_REVISION_TARGET	69
-#endif /* IP6T_SO_GET_REVISION_MATCH   Old kernel source */
-
 extern int line;
 
 /* Your shared library should call one of these. */
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 <libiptc/libiptc.h>
 #include <iptables/internal.h>
 
-#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. */
diff --git a/xtables.c b/xtables.c
index c8988893..3c89a9d1 100644
--- a/xtables.c
+++ b/xtables.c
@@ -39,6 +39,15 @@
 #ifndef NO_SHARED_LIBS
 #include <dlfcn.h>
 #endif
+#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
+#ifndef IP6T_SO_GET_REVISION_MATCH /* Old kernel source. */
+#	define IP6T_SO_GET_REVISION_MATCH	68
+#	define IP6T_SO_GET_REVISION_TARGET	69
+#endif
+
 
 #define NPROTO	255