From 5e9eaed23d0cf1cfdd49c88e68beb43e611f0191 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Mon, 17 Dec 2007 13:12:01 +0000
Subject: 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>
---
 include/libiptc/libip6tc.h | 1 +
 include/libiptc/libiptc.h  | 1 +
 include/xtables.h          | 6 +-----
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h
index 7a247c46..dc416a2f 100644
--- 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 50765d98..f9f92d5b 100644
--- 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 de5ecb13..f81daad6 100644
--- 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 */
-- 
cgit v1.2.3