diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-06-15 10:52:53 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-06-26 22:30:50 +0000 |
| commit | fe94133f0d06935bb5f2afe21f59bbb078d3d9d3 (patch) | |
| tree | 8da435b8feeb134699837e8e88fcb7f626936431 /caputils | |
| parent | c68a1f049e3725240872639e75ad52b89c24cc01 (diff) | |
Remove code specific to older versions of Visual Studio.
Remove -DBUILD_WINDOWS and sections of code that we no longer use.
Bug: 14715
Change-Id: Iae1a950e2f52f4ce45fcf0ae5dea06c1172c3a28
Reviewed-on: https://code.wireshark.org/review/28466
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/capture_win_ifnames.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/caputils/capture_win_ifnames.c b/caputils/capture_win_ifnames.c index e36e39b407..f61e098fde 100644 --- a/caputils/capture_win_ifnames.c +++ b/caputils/capture_win_ifnames.c @@ -184,36 +184,6 @@ parse_as_guid(const char *guid_text, GUID *guid) } /**********************************************************************************/ -gboolean IsWindowsVistaOrLater() -{ -#if (_MSC_VER >= 1800) - /* - * On VS2103, GetVersionEx is deprecated. Microsoft recommend to - * use VerifyVersionInfo instead - */ - OSVERSIONINFOEX osvi; - DWORDLONG dwlConditionMask = 0; - int op = VER_GREATER_EQUAL; - - SecureZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - osvi.dwMajorVersion = 6; - VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, op); - return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask); -#else - OSVERSIONINFO osvi; - - SecureZeroMemory(&osvi, sizeof(OSVERSIONINFO)); - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - - if(GetVersionEx(&osvi)){ - return osvi.dwMajorVersion >= 6; - } - return FALSE; -#endif -} - -/**********************************************************************************/ /* Get the friendly name for the given GUID */ char * get_interface_friendly_name_from_device_guid(__in GUID *guid) |