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 b8478d409129395ea12883aab5bd29b84c23c8e5..98f2da5c14448d2dd5fe7e9d70b72b02e1e6649d 100644 (file)
--- 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 963905aab762bf624b4c7691ac9ada3521869f39..d309059e8f4299964480e7334f3ea1fe52d864c4 100644 (file)
--- 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 c8988893f0232b70eaf742a7ac3f56216c2efe5e..3c89a9d1f2a46df05fdedb4ebce6ea5830274308 100644 (file)
--- 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