aboutsummaryrefslogtreecommitdiffstats
path: root/capture-pcap-util.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-06-23 14:55:56 -0700
committerGuy Harris <guy@alum.mit.edu>2014-06-23 21:56:42 +0000
commit1d92195de847a30e570ca690ab0a2034cb3a51d3 (patch)
tree95b000735679f0b957b8c9eecc9ad4d700ea4efc /capture-pcap-util.h
parentdd7134d907350ccc574cdec596f4162860912bb9 (diff)
Have individual programs get libpcap and libz version info.
That way, the code that constructs the runtime version string doesn't itself have to call libpcap and libz, and could be usable in programs that don't call them. While we're at it, add "with" to the run-time version information for GnuTLS and libgcrypt, to match the compile-time version information, and add the version information from libwireshark to TShark. Change-Id: I3726a027d032270b032292da9314c1cec535dcd2 Reviewed-on: https://code.wireshark.org/review/2587 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'capture-pcap-util.h')
-rw-r--r--capture-pcap-util.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/capture-pcap-util.h b/capture-pcap-util.h
index 49ebe52c40..2dde7b89db 100644
--- a/capture-pcap-util.h
+++ b/capture-pcap-util.h
@@ -23,14 +23,14 @@
#ifndef __CAPTURE_PCAP_UTIL_H__
#define __CAPTURE_PCAP_UTIL_H__
-#ifdef HAVE_LIBPCAP
-
-#include <pcap.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
+#ifdef HAVE_LIBPCAP
+
+#include <pcap.h>
+
/*
* A snapshot length of 0 is useless - and libpcap/WinPcap don't guarantee
* that a snapshot length of 0 will work, and, on some platforms, it won't
@@ -50,10 +50,6 @@ GList *get_remote_interface_list(const char *hostname, const char *port,
const char *linktype_val_to_name(int dlt);
int linktype_name_to_val(const char *linktype);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* HAVE_LIBPCAP */
/*
@@ -71,4 +67,8 @@ extern void get_compiled_pcap_version(GString *str);
*/
extern void get_runtime_pcap_version(GString *str);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
#endif /* __CAPTURE_PCAP_UTIL_H__ */