forked from osmocom/wireshark
Fix Windows build without pcap.
Change-Id: Ib79da01124a7f1b44f168ce19691d3ceaa7d5a68 Reviewed-on: https://code.wireshark.org/review/21619 Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
parent
572a2e93f4
commit
a8228fa80b
8
tshark.c
8
tshark.c
|
@ -36,6 +36,10 @@
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_WINSOCK2_H
|
||||||
|
# include <winsock2.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -753,6 +757,7 @@ main(int argc, char *argv[])
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
ws_init_dll_search_path();
|
ws_init_dll_search_path();
|
||||||
|
#ifdef HAVE_LIBPCAP
|
||||||
/* Load wpcap if possible. Do this before collecting the run-time version information */
|
/* Load wpcap if possible. Do this before collecting the run-time version information */
|
||||||
load_wpcap();
|
load_wpcap();
|
||||||
|
|
||||||
|
@ -761,7 +766,8 @@ main(int argc, char *argv[])
|
||||||
fprintf(stderr, "The NPF driver isn't running. You may have trouble "
|
fprintf(stderr, "The NPF driver isn't running. You may have trouble "
|
||||||
"capturing or\nlisting interfaces.\n");
|
"capturing or\nlisting interfaces.\n");
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* HAVE_LIBPCAP */
|
||||||
|
#endif /* _WIN32 */
|
||||||
|
|
||||||
/* Get the compile-time version information string */
|
/* Get the compile-time version information string */
|
||||||
comp_info_str = get_compiled_version_info(get_tshark_compiled_version_info,
|
comp_info_str = get_compiled_version_info(get_tshark_compiled_version_info,
|
||||||
|
|
Loading…
Reference in New Issue