diff options
| author | Max Bélanger <aeromax@gmail.com> | 2018-01-07 02:05:18 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2018-01-07 02:05:18 (GMT) |
| commit | af11a15c586e980a157c04ee60b6e33dc7228f3f (patch) | |
| tree | 59b2a2408f881a9dec12aaff89a935a27829e6f5 /Modules | |
| parent | d80b443f02e087dd289ffefd04179c675304d76d (diff) | |
| download | cpython-af11a15c586e980a157c04ee60b6e33dc7228f3f.zip cpython-af11a15c586e980a157c04ee60b6e33dc7228f3f.tar.gz cpython-af11a15c586e980a157c04ee60b6e33dc7228f3f.tar.bz2 | |
bpo-32282: Remove unnecessary check for `VersionHelpers.h` in `socketmodule.c` on Windows
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/socketmodule.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index d52d9db..d75a51a 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -297,10 +297,8 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/net/getaddrinfo.c.diff?r1=1.82& # include <fcntl.h> # endif -#if defined(_MSC_VER) && _MSC_VER >= 1800 /* Provides the IsWindows7SP1OrGreater() function */ #include <VersionHelpers.h> -#endif #endif @@ -6552,15 +6550,7 @@ PyInit__socket(void) #ifdef MS_WINDOWS if (support_wsa_no_inherit == -1) { -#if defined(_MSC_VER) && _MSC_VER >= 1800 support_wsa_no_inherit = IsWindows7SP1OrGreater(); -#else - DWORD version = GetVersion(); - DWORD major = (DWORD)LOBYTE(LOWORD(version)); - DWORD minor = (DWORD)HIBYTE(LOWORD(version)); - /* need Windows 7 SP1, 2008 R2 SP1 or later */ - support_wsa_no_inherit = major > 6 || (major == 6 && minor >= 1); -#endif } #endif |