summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2014-01-10 00:05:38 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2014-01-10 01:18:47 +0100
commit57175a87d47d88996965119838650c10f123c4db (patch)
treed368ea84e405eda08eabd0500a072ec825b3224b /src
parent76746098d026bdba1f3678da8febbd133e869a94 (diff)
src: fix compilation due to missing NFPROTO_INET definition
This adds a copy of the include/linux/netfilter.h kernel header that defines NFPROTO_INET, so libnftables compiles with relatively old kernel headers in the system. chain.c: In function 'nft_hooknum2str': chain.c:53:7: error: 'NFPROTO_INET' undeclared (first use in this function) This required to reorder and remove unneeded headers in src/expr/data_reg.c to avoid a compilation warning due to redefinition of __visible. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r--src/expr/data_reg.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
index 76231af..a198c67 100644
--- a/src/expr/data_reg.c
+++ b/src/expr/data_reg.c
@@ -18,14 +18,13 @@
#include <netinet/in.h>
#include <libmnl/libmnl.h>
-#include <linux/netfilter.h>
-#include <linux/netfilter/nf_tables.h>
#include <libnftables/expr.h>
#include <libnftables/rule.h>
-#include "expr_ops.h"
-#include "data_reg.h"
#include "internal.h"
+#include <linux/netfilter.h>
+#include <linux/netfilter/nf_tables.h>
+
#ifdef JSON_PARSING
static int nft_data_reg_verdict_json_parse(union nft_data_reg *reg, json_t *data)
{