summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2008-06-27 12:11:02 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2008-06-27 12:11:02 +0200
commit5eaffce63ada098bc5a96101df20f2e7a187eeeb (patch)
tree2e284b4ae7b62ee8f8232ce2a411bd0f4dbc5cfb
parente8d8548e4f921775c3fea0d40f684c53208044eb (diff)
parent3b897049475aefa75b318f968162fdb3a631b129 (diff)
Merge branch 'master' of vishnu.netfilter.org:/data/git/libnetfilter_queuelibnetfilter_queue-0.0.16
-rw-r--r--include/libnetfilter_queue/libipq.h8
-rw-r--r--include/libnetfilter_queue/libnetfilter_queue.h8
2 files changed, 15 insertions, 1 deletions
diff --git a/include/libnetfilter_queue/libipq.h b/include/libnetfilter_queue/libipq.h
index c33f7e4..0f0df22 100644
--- a/include/libnetfilter_queue/libipq.h
+++ b/include/libnetfilter_queue/libipq.h
@@ -50,6 +50,10 @@ typedef unsigned long ipq_id_t;
#define MSG_TRUNC 0x20
#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct ipq_handle
{
struct nfq_handle *nfqnlh;
@@ -84,5 +88,9 @@ int ipq_ctl(const struct ipq_handle *h, int request, ...);
char *ipq_errstr(void);
void ipq_perror(const char *s);
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
#endif /* _LIBIPQ_H */
diff --git a/include/libnetfilter_queue/libnetfilter_queue.h b/include/libnetfilter_queue/libnetfilter_queue.h
index 6695c3d..1a72c51 100644
--- a/include/libnetfilter_queue/libnetfilter_queue.h
+++ b/include/libnetfilter_queue/libnetfilter_queue.h
@@ -18,6 +18,10 @@
#include <libnetfilter_queue/linux_nfnetlink_queue.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct nfq_handle;
struct nfq_q_handle;
struct nfq_data;
@@ -94,6 +98,8 @@ extern struct nfqnl_msg_packet_hw *nfq_get_packet_hw(struct nfq_data *nfad);
/* return -1 if problem, length otherwise */
extern int nfq_get_payload(struct nfq_data *nfad, char **data);
-
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
#endif /* __LIBNFQNETLINK_H */