None of the header files for the packet capture library

are suitable to include in a C++ file.

PR:		7229
Reviewed by:	phk
Submitted by:	Craig Spannring <cts@internetcds.com>

3 files changed, 30 insertions, 0 deletions

diff --git a/contrib/libpcap/pcap-int.h b/contrib/libpcap/pcap-int.h
index 02bb3a815c57..1feda0b16a81 100644
--- a/contrib/libpcap/pcap-int.h
+++ b/contrib/libpcap/pcap-int.h
@@ -36,6 +36,10 @@
 #ifndef pcap_int_h
 #define pcap_int_h
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <pcap.h>
 
 /*
@@ -114,4 +118,9 @@ int	pcap_read(pcap_t *, int cnt, pcap_handler, u_char *);
 
 /* XXX */
 extern	int pcap_fddipad;
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/contrib/libpcap/pcap-namedb.h b/contrib/libpcap/pcap-namedb.h
index e3b399a92a82..4310907d5afa 100644
--- a/contrib/libpcap/pcap-namedb.h
+++ b/contrib/libpcap/pcap-namedb.h
@@ -36,6 +36,11 @@
 #ifndef lib_pcap_ethers_h
 #define lib_pcap_ethers_h
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
+
 /*
  * As returned by the pcap_next_etherent()
  * XXX this stuff doesn't belong in this interface, but this
@@ -73,4 +78,9 @@ int __pcap_atodn(const char *, bpf_u_int32 *);
 int __pcap_atoin(const char *, bpf_u_int32 *);
 u_short	__pcap_nametodnaddr(const char *);
 
+#ifdef __cplusplus
+}
+#endif
+     
+
 #endif
diff --git a/contrib/libpcap/pcap.h b/contrib/libpcap/pcap.h
index 469873538eb1..8180ce9d4ebb 100644
--- a/contrib/libpcap/pcap.h
+++ b/contrib/libpcap/pcap.h
@@ -43,6 +43,11 @@
 
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
+
 #define PCAP_VERSION_MAJOR 2
 #define PCAP_VERSION_MINOR 4
 
@@ -134,4 +139,10 @@ void	pcap_dump(u_char *, const struct pcap_pkthdr *, const u_char *);
 /* XXX this guy lives in the bpf tree */
 u_int	bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
 char	*bpf_image(struct bpf_insn *, int);
+
+#ifdef __cplusplus
+}
+#endif
+     
+
 #endif