From: guy <guy>
Date: Sat, 29 Jul 2000 07:36:41 +0000 (+0000)
Subject: Pick up, from the FreeBSD libpcap, changes to surround all declarations with
X-Git-Tag: libpcap-0.6.1~106
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/84f822f4d81584af867b7d74d9169ce70a04501c

Pick up, from the FreeBSD libpcap, changes to surround all declarations with

	#ifdef __cplusplus
	extern "C" {
	#endif

		...

	#ifdef __cplusplus
	}
	#endif

so that C++ code can include these header files and correctly call the
C-language routines they declare.
---

diff --git a/pcap-int.h b/pcap-int.h
index 784286ec..14756ce0 100644
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -30,12 +30,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.25 2000-07-18 03:43:47 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.26 2000-07-29 07:36:41 guy Exp $ (LBL)
  */
 
 #ifndef pcap_int_h
 #define pcap_int_h
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <pcap.h>
 
 /*
@@ -159,4 +163,9 @@ int	pcap_read(pcap_t *, int cnt, pcap_handler, u_char *);
 
 /* XXX */
 extern	int pcap_fddipad;
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/pcap-namedb.h b/pcap-namedb.h
index ccd21fd4..fd8642fd 100644
--- a/pcap-namedb.h
+++ b/pcap-namedb.h
@@ -30,12 +30,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.7 2000-04-27 09:18:58 itojun Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.8 2000-07-29 07:36:43 guy Exp $ (LBL)
  */
 
 #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
@@ -76,4 +80,8 @@ 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/pcap.h b/pcap.h
index 1308f9a9..ac9f05cc 100644
--- a/pcap.h
+++ b/pcap.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.23 2000-06-26 04:57:11 assar Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.24 2000-07-29 07:36:43 guy Exp $ (LBL)
  */
 
 #ifndef lib_pcap_h
@@ -43,6 +43,10 @@
 
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define PCAP_VERSION_MAJOR 2
 #define PCAP_VERSION_MINOR 4
 
@@ -139,4 +143,9 @@ u_int	bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
 int	bpf_validate(struct bpf_insn *f, int len);
 char	*bpf_image(struct bpf_insn *, int);
 void	bpf_dump(struct bpf_program *, int);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif