diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-06-25 17:38:19 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-06-26 20:30:02 +0000 |
| commit | c74dba69fc4118e1d81c2bdcbc6ba52fd5a465d5 (patch) | |
| tree | 80fdeb8e41e594fc26407bda2c39692870445cbb /tshark.c | |
| parent | 1437b421a29e361d3669e5c27ae22906efbd0832 (diff) | |
Windows: Fetch our version using RtlGetVersion.
GetVersionEx is deprecated. Use RtlGetVersion instead. Remove
get_windows_major_version since it's no longer needed.
Change-Id: I02f6458608c2328a96a0ac71c6b1f9187babd049
Reviewed-on: https://code.wireshark.org/review/28443
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'tshark.c')
| -rw-r--r-- | tshark.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -104,7 +104,6 @@ #include "caputils/capture_ifinfo.h" #ifdef _WIN32 #include "caputils/capture-wpcap.h" -#include <wsutil/os_version_info.h> #include <wsutil/unicode-utils.h> #endif /* _WIN32 */ #include <capchild/capture_session.h> @@ -802,7 +801,7 @@ main(int argc, char *argv[]) load_wpcap(); /* Warn the user if npf.sys isn't loaded. */ - if (!npf_sys_is_running() && get_windows_major_version() >= 6) { + if (!npf_sys_is_running()) { fprintf(stderr, "The NPF driver isn't running. You may have trouble " "capturing or\nlisting interfaces.\n"); } |