[libnetfilter_queue] Merge branch 'master' of vishnu.netfilter.org:/data/git/libnetfilter_queue

Patrick McHardy netfilter-cvslog-bounces at lists.netfilter.org
Tue Jun 24 18:28:12 CEST 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnetfilter_queue.git;a=commit;h=3b897049475aefa75b318f968162fdb3a631b129
commit 3b897049475aefa75b318f968162fdb3a631b129
Merge: 0b9b678... d6bf05a...
Author:     Patrick McHardy <kaber at trash.net>
AuthorDate: Tue Jun 24 18:15:10 2008 +0200
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Tue Jun 24 18:15:10 2008 +0200

    Merge branch 'master' of vishnu.netfilter.org:/data/git/libnetfilter_queue

commit 0b9b67866af8734a8d39dc7c229da7e4ba1be89f
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jun 24 18:14:08 2008 +0200
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Tue Jun 24 18:14:08 2008 +0200

    libnfq: mark functions as extern C
    
    mark functions as extern C
    
    This is needed when #included from C++.
    
    Reported-by: Simon <turner25 at gmail.com>
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>
       via  3b897049475aefa75b318f968162fdb3a631b129 (commit)
       via  0b9b67866af8734a8d39dc7c229da7e4ba1be89f (commit)
      from  d6bf05a9974ea3bd46c69fe437291b561ce994b4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3b897049475aefa75b318f968162fdb3a631b129
Merge: 0b9b67866af8734a8d39dc7c229da7e4ba1be89f d6bf05a9974ea3bd46c69fe437291b561ce994b4
Author: Patrick McHardy <kaber at trash.net>
Date:   Tue Jun 24 18:15:10 2008 +0200

    Merge branch 'master' of vishnu.netfilter.org:/data/git/libnetfilter_queue

commit 0b9b67866af8734a8d39dc7c229da7e4ba1be89f
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Tue Jun 24 18:14:08 2008 +0200

    libnfq: mark functions as extern C
    
    mark functions as extern C
    
    This is needed when #included from C++.
    
    Reported-by: Simon <turner25 at gmail.com>
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

-----------------------------------------------------------------------

 include/libnetfilter_queue/libipq.h             |    8 ++++++++
 include/libnetfilter_queue/libnetfilter_queue.h |    8 +++++++-
 2 files changed, 15 insertions(+), 1 deletions(-)
mark functions as extern C

This is needed when #included from C++.

Reported-by: Simon <turner25 at gmail.com>
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
Signed-off-by: Patrick McHardy <kaber at trash.net>

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 */



More information about the netfilter-cvslog mailing list