diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-21 14:32:45 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-21 21:33:11 +0000 |
| commit | a70dea195625f32a026d10d937345d177f81aead (patch) | |
| tree | 96f3fd13e785998781d9a179745494a14788d1ee /ui | |
| parent | 3c979e63a7c2341f0c3bdf270d22fce17bb93562 (diff) | |
| download | wireshark-a70dea195625f32a026d10d937345d177f81aead.tar.gz | |
Move get_os_major_version() to wsutil and rename it to get_windows_major_version().
It's Windows-specific, so name it appropriately.
Change-Id: Ic518cbfabebf95757f6b308a4d547a6cabed6a5e
Reviewed-on: https://code.wireshark.org/review/2528
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 231d4919a4..1d29eb2402 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -63,6 +63,7 @@ #include <wsutil/report_err.h> #include <wsutil/u3.h> #include <wsutil/copyright_info.h> +#include <wsutil/os_version_info.h> #include <wiretap/merge.h> @@ -2100,7 +2101,7 @@ check_and_warn_user_startup(gchar *cf_name _U_) #ifdef _WIN32 /* Warn the user if npf.sys isn't loaded. */ - if (!get_stdin_capture() && !cf_name && !npf_sys_is_running() && recent.privs_warn_if_no_npf && get_os_major_version() >= 6) { + if (!get_stdin_capture() && !cf_name && !npf_sys_is_running() && recent.privs_warn_if_no_npf && get_windows_major_version() >= 6) { priv_warning_dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, "The NPF driver isn't running. You may have trouble\n" "capturing or listing interfaces."); |