diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-06-15 10:52:53 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-07-20 17:59:32 +0000 |
| commit | 35ac0ba35403a2256df6caece730d69a1d8be267 (patch) | |
| tree | 75b77791ffdfbe1fafdb2a28fdf9085a0813c813 /caputils | |
| parent | f4c57ef8b373360ae810697d3476e44bf1cfa2c6 (diff) | |
| download | wireshark-35ac0ba35403a2256df6caece730d69a1d8be267.tar.gz wireshark-35ac0ba35403a2256df6caece730d69a1d8be267.tar.bz2 wireshark-35ac0ba35403a2256df6caece730d69a1d8be267.zip | |
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>
(cherry picked from commit fe94133f0d06935bb5f2afe21f59bbb078d3d9d3)
Reviewed-on: https://code.wireshark.org/review/28777
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 92b22b95d5..93bd118a13 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) |