summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org>2005-09-23 18:38:11 +0000
committer/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org>2005-09-23 18:38:11 +0000
commit2de044ebe8b630fe53e9e0ab476dd6da18f7f1f7 (patch)
treef8c5e27539d85fa006115ade856c2b21d3393bc0
parent1e77f8302ef9b0d173325dccb0ad06b88ee06a5c (diff)
fix header dependencies
-rw-r--r--_log/include/libnfnetlink_log/libnfnetlink_log.h8
-rw-r--r--_log/src/libnfnetlink_log.c3
2 files changed, 4 insertions, 7 deletions
diff --git a/_log/include/libnfnetlink_log/libnfnetlink_log.h b/_log/include/libnfnetlink_log/libnfnetlink_log.h
index d204bce..7b725a6 100644
--- a/_log/include/libnfnetlink_log/libnfnetlink_log.h
+++ b/_log/include/libnfnetlink_log/libnfnetlink_log.h
@@ -9,9 +9,9 @@
#ifndef __LIBNFNETLINK_LOG_H
#define __LIBNFNETLINK_LOG_H
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nfnetlink_log.h>
#include <libnfnetlink/libnfnetlink.h>
+//#include <linux/netfilter/nfnetlink.h>
+#include <linux/netfilter/nfnetlink_log.h>
struct nfulnl_handle;
struct nfulnl_g_handle;
@@ -21,8 +21,8 @@ extern int nfulnl_errno;
extern struct nfnl_handle *nfulnl_nfnlh(struct nfulnl_handle *h);
extern int nfulnl_fd(struct nfulnl_handle *h);
-typedef nfulnl_callback(struct nfulnl_g_handle *gh, struct nfgenmsg *nfmsg,
- struct nfattr *nfa[], void *data);
+typedef int nfulnl_callback(struct nfulnl_g_handle *gh, struct nfgenmsg *nfmsg,
+ struct nfattr *nfa[], void *data);
extern struct nfulnl_handle *nfulnl_open(void);
diff --git a/_log/src/libnfnetlink_log.c b/_log/src/libnfnetlink_log.c
index 3b3c7dc..ee27156 100644
--- a/_log/src/libnfnetlink_log.c
+++ b/_log/src/libnfnetlink_log.c
@@ -25,9 +25,6 @@
#include <errno.h>
#include <netinet/in.h>
#include <sys/socket.h>
-#include <linux/netlink.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nfnetlink_log.h>
#include <libnfnetlink/libnfnetlink.h>
#include <libnfnetlink_log/libnfnetlink_log.h>