diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-05-18 10:38:19 -0700 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2018-05-18 20:38:19 +0300 |
| commit | 09eb6fe8fdd2515546b933902aef36b72d417ace (patch) | |
| tree | cee4e44df990dac648c1f7628f7ab22f93990ea4 /Modules/socketmodule.c | |
| parent | e6e440ad5cf327c663224094f3efee1cedc39d89 (diff) | |
| download | cpython-git-09eb6fe8fdd2515546b933902aef36b72d417ace.tar.gz | |
bpo-32282: Remove unnecessary check for `VersionHelpers.h` in `socketmodule.c` on Windows (GH-5120)
(cherry picked from commit af11a15c586e980a157c04ee60b6e33dc7228f3f)
Diffstat (limited to 'Modules/socketmodule.c')
| -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 36920f7f86..ff73a3fbfa 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -312,10 +312,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 /* remove some flags on older version Windows during run-time. https://msdn.microsoft.com/en-us/library/windows/desktop/ms738596.aspx */ @@ -6571,15 +6569,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 |