use <linux/types.h>

Remove our own definitions of the Linux types and use <linux/types.h>
instead. libiptc needs it too, or otherwise will choke on union
nf_inet_addr.

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>

diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h
index 7a247c46f7202b99de4f6d67d73659da086e201c..dc416a2f4129e55af66e8c4853b09ff95ebd1559 100644 (file)
--- a/include/libiptc/libip6tc.h
+++ b/include/libiptc/libip6tc.h
@@ -2,6 +2,7 @@
 #define _LIBIP6TC_H
 /* Library which manipulates firewall rules. Version 0.2. */
 
+#include <linux/types.h>
 #include <libiptc/ipt_kernel_headers.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 

diff --git a/include/libiptc/libiptc.h b/include/libiptc/libiptc.h
index 50765d9815fe8c1221e2c5bb260963293b19d47d..f9f92d5b09134a7a7ea93133c7c2c03c5dac6734 100644 (file)
--- a/include/libiptc/libiptc.h
+++ b/include/libiptc/libiptc.h
@@ -2,6 +2,7 @@
 #define _LIBIPTC_H
 /* Library which manipulates filtering rules. */
 
+#include <linux/types.h>
 #include <libiptc/ipt_kernel_headers.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 

diff --git a/include/xtables.h b/include/xtables.h
index de5ecb13132e05a3990ec100475c052c86f415ad..f81daad6180b91676cfaf145be7f45816e850e86 100644 (file)
--- a/include/xtables.h
+++ b/include/xtables.h
@@ -2,6 +2,7 @@
 #define _XTABLES_H
 
 #include <sys/types.h>
+#include <linux/types.h>
 #include <linux/netfilter/x_tables.h>
 #include <libiptc/libxtc.h>
 
@@ -234,9 +235,4 @@ extern const char *program_name, *program_version;
   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 */