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.

1 files changed, 9 insertions, 1 deletions

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