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 /ui/qt/main.cpp | |
| 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 'ui/qt/main.cpp')
| -rw-r--r-- | ui/qt/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 178799846c..ccab602e70 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -94,7 +94,6 @@ # include "caputils/capture_wpcap_packet.h" # include <tchar.h> /* Needed for Unicode */ # include <wsutil/file_util.h> -# include <wsutil/os_version_info.h> #endif /* _WIN32 */ #ifdef HAVE_AIRPCAP @@ -306,7 +305,7 @@ check_and_warn_user_startup(const QString &cf_name) #ifdef _WIN32 /* Warn the user if npf.sys isn't loaded. */ - if (!get_stdin_capture() && cf_name.isEmpty() && !npf_sys_is_running() && recent.privs_warn_if_no_npf && get_windows_major_version() >= 6) { + if (!get_stdin_capture() && cf_name.isEmpty() && !npf_sys_is_running() && recent.privs_warn_if_no_npf) { simple_message_box(ESD_TYPE_WARN, &recent.privs_warn_if_no_npf, "%s", "The NPF driver isn't running. You may have trouble\n" "capturing or listing interfaces."); |