summaryrefslogtreecommitdiff
path: root/tshark.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-05-12 11:43:09 -0700
committerGuy Harris <guy@alum.mit.edu>2017-05-12 18:44:10 +0000
commita8228fa80bd584ec8cb093cc868add56bf9346b6 (patch)
tree84245f664de5802e905a8297bc92ff2f6877ae22 /tshark.c
parent572a2e93f48efd68ae5160ba0e596e51a4ea3da2 (diff)
downloadwireshark-a8228fa80bd584ec8cb093cc868add56bf9346b6.tar.gz
Fix Windows build without pcap.
Change-Id: Ib79da01124a7f1b44f168ce19691d3ceaa7d5a68 Reviewed-on: https://code.wireshark.org/review/21619 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/tshark.c b/tshark.c
index 4e4cb18306..e4d4551c96 100644
--- a/tshark.c
+++ b/tshark.c
@@ -36,6 +36,10 @@
#include <errno.h>
+#ifdef HAVE_WINSOCK2_H
+# include <winsock2.h>
+#endif
+
#ifndef _WIN32
#include <signal.h>
#endif
@@ -753,6 +757,7 @@ main(int argc, char *argv[])
#ifdef _WIN32
ws_init_dll_search_path();
+#ifdef HAVE_LIBPCAP
/* Load wpcap if possible. Do this before collecting the run-time version information */
load_wpcap();
@@ -761,7 +766,8 @@ main(int argc, char *argv[])
fprintf(stderr, "The NPF driver isn't running. You may have trouble "
"capturing or\nlisting interfaces.\n");
}
-#endif
+#endif /* HAVE_LIBPCAP */
+#endif /* _WIN32 */
/* Get the compile-time version information string */
comp_info_str = get_compiled_version_info(get_tshark_compiled_version_info,