summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net </C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net>2007-12-17 13:12:01 +0000
committer/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net </C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net>2007-12-17 13:12:01 +0000
commit126ad50b16852c0a79ec72e43d5f5dfd9f10380a (patch)
tree324810721e47692c7d63d35440d903af659108c1
parente8aa6a9b2d19e8675914146360dd3d0a96491c65 (diff)
[PATCH]: 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>
-rw-r--r--include/libiptc/libip6tc.h1
-rw-r--r--include/libiptc/libiptc.h1
-rw-r--r--include/xtables.h6
3 files changed, 3 insertions, 5 deletions
diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h
index 7a247c4..dc416a2 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 50765d9..f9f92d5 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 de5ecb1..f81daad 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 */