Moves all declarations in iptables_common.h to xtables.h.

diff --git a/extensions/libipt_dscp_helper.c b/extensions/libipt_dscp_helper.c
index 31adb6cd632c8425c41cb1dd619402b6e057b165..fb68bb92402cb544936970bdd7e63fd5527de105 100644 (file)
--- a/extensions/libipt_dscp_helper.c
+++ b/extensions/libipt_dscp_helper.c
@@ -11,8 +11,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <iptables_common.h>
-
+#include <xtables.h>
 
 
 static struct ds_class

diff --git a/include/ip6tables.h b/include/ip6tables.h
index b0de395d40b2d48e8ed6aaf922e5e1e1cbbf147c..4a511b77168202c4e4fb35d8b7849cff1179e9af 100644 (file)
--- a/include/ip6tables.h
+++ b/include/ip6tables.h
@@ -3,7 +3,6 @@
 
 #include <xtables.h>
 
-#include "iptables_common.h"
 #include "libiptc/libip6tc.h"
 
 #ifndef IP6T_LIB_DIR

diff --git a/include/iptables.h b/include/iptables.h
index 83b7363b91bd997413cae0c6d0c3683bb0d3bc41..91a93c325e701acdd3f4e820db0b9c9a4e6de9f5 100644 (file)
--- a/include/iptables.h
+++ b/include/iptables.h
@@ -2,7 +2,6 @@
 #define _IPTABLES_USER_H
 
 #include "xtables.h"
-#include "iptables_common.h"
 #include "libiptc/libiptc.h"
 
 #ifndef IPT_LIB_DIR

diff --git a/include/iptables_common.h b/include/iptables_common.h
deleted file mode 100644 (file)
index cf8a4ba..0000000
--- a/include/iptables_common.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _IPTABLES_COMMON_H
-#define _IPTABLES_COMMON_H
-/* Shared definitions between ipv4 and ipv6. */
-
-enum exittype {
-       OTHER_PROBLEM = 1,
-       PARAMETER_PROBLEM,
-       VERSION_PROBLEM,
-       RESOURCE_PROBLEM
-};
-
-/* this is a special 64bit data type that is 8-byte aligned */
-#define aligned_u64 unsigned long long __attribute__((aligned(8)))
-
-extern void exit_printhelp() __attribute__((noreturn));
-extern void exit_tryhelp(int) __attribute__((noreturn));
-int check_inverse(const char option[], int *invert, int *optind, int argc);
-void exit_error(enum exittype, char *, ...)__attribute__((noreturn,
-                                                         format(printf,2,3)));
-extern const char *program_name, *program_version;
-
-#define _init __attribute__((constructor)) my_init
-#ifdef NO_SHARED_LIBS
-# ifdef _INIT
-#  undef _init
-#  define _init _INIT
-# endif
-  extern void init_extensions(void);
-#endif
-
-#define __be32 u_int32_t
-#define __le32 u_int32_t
-#define __be16 u_int16_t
-#define __le16 u_int16_t
-
-#endif /*_IPTABLES_COMMON_H*/

diff --git a/include/xtables.h b/include/xtables.h
index 43de25ce999d27a2354ecf7cac7a64155d25761d..231f514f2a96deaab43a17f864cd073f21f54915 100644 (file)
--- a/include/xtables.h
+++ b/include/xtables.h
@@ -211,4 +211,35 @@ extern u_int16_t parse_port(const char *port, const char *proto);
 extern void
 parse_interface(const char *arg, char *vianame, unsigned char *mask);
 
+enum exittype {
+       OTHER_PROBLEM = 1,
+       PARAMETER_PROBLEM,
+       VERSION_PROBLEM,
+       RESOURCE_PROBLEM
+};
+
+/* this is a special 64bit data type that is 8-byte aligned */
+#define aligned_u64 unsigned long long __attribute__((aligned(8)))
+
+extern void exit_printhelp() __attribute__((noreturn));
+extern void exit_tryhelp(int) __attribute__((noreturn));
+int check_inverse(const char option[], int *invert, int *optind, int argc);
+void exit_error(enum exittype, char *, ...)__attribute__((noreturn,
+                                                         format(printf,2,3)));
+extern const char *program_name, *program_version;
+
+#define _init __attribute__((constructor)) my_init
+#ifdef NO_SHARED_LIBS
+# ifdef _INIT
+#  undef _init
+#  define _init _INIT
+# endif
+  extern void init_extensions(void);
+#endif
+
+#define __be32 u_int32_t
+#define __le32 u_int32_t
+#define __be16 u_int16_t
+#define __le16 u_int16_t
+
 #endif /* _XTABLES_H */

diff --git a/xtables.c b/xtables.c
index ea5633ec70bdb4ef3da828742cd00a719aaec302..baee48343774b13e5d5383fd6f5014453d41c688 100644 (file)
--- a/xtables.c
+++ b/xtables.c
@@ -29,7 +29,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <iptables_common.h>
 #include <xtables.h>
 
 #define NPROTO 255