summaryrefslogtreecommitdiff
path: root/tshark.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-06-21 14:32:45 -0700
committerGuy Harris <guy@alum.mit.edu>2014-06-21 21:33:11 +0000
commita70dea195625f32a026d10d937345d177f81aead (patch)
tree96f3fd13e785998781d9a179745494a14788d1ee /tshark.c
parent3c979e63a7c2341f0c3bdf270d22fce17bb93562 (diff)
downloadwireshark-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 'tshark.c')
-rw-r--r--tshark.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tshark.c b/tshark.c
index bb40c5a07a..b761c7270b 100644
--- a/tshark.c
+++ b/tshark.c
@@ -66,6 +66,7 @@
#include <wsutil/filesystem.h>
#include <wsutil/report_err.h>
#include <wsutil/copyright_info.h>
+#include <wsutil/os_version_info.h>
#include "globals.h"
#include <epan/timestamp.h>
@@ -895,7 +896,7 @@ check_capture_privs(void) {
#ifdef _WIN32
load_wpcap();
/* Warn the user if npf.sys isn't loaded. */
- if (!npf_sys_is_running() && get_os_major_version() >= 6) {
+ if (!npf_sys_is_running() && get_windows_major_version() >= 6) {
fprintf(stderr, "The NPF driver isn't running. You may have trouble "
"capturing or\nlisting interfaces.\n");
}