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 /version_info.c | |
| parent | 3c979e63a7c2341f0c3bdf270d22fce17bb93562 (diff) | |
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 'version_info.c')
| -rw-r--r-- | version_info.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/version_info.c b/version_info.c index f7376505a0..7ed06c511a 100644 --- a/version_info.c +++ b/version_info.c @@ -40,10 +40,6 @@ #include "version.h" -#ifdef _WIN32 -#include <windows.h> -#endif - #ifdef HAVE_LIBCAP # include <sys/capability.h> #endif @@ -219,23 +215,6 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) end_string(str); } -#if defined(_WIN32) -/* - * Get the major OS version. - */ -/* XXX - Should this return the minor version as well, e.g. 0x00050002? */ -guint32 -get_os_major_version() -{ - OSVERSIONINFO info; - info.dwOSVersionInfoSize = sizeof info; - if (GetVersionEx(&info)) { - return info.dwMajorVersion; - } - return 0; -} -#endif - /* * Editor modelines * |