diff options
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2017-12-12-14-02-28.bpo-32282.xFVMTn.rst | 2 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-12-12-14-02-28.bpo-32282.xFVMTn.rst b/Misc/NEWS.d/next/Core and Builtins/2017-12-12-14-02-28.bpo-32282.xFVMTn.rst new file mode 100644 index 0000000..1c833c5 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-12-12-14-02-28.bpo-32282.xFVMTn.rst @@ -0,0 +1,2 @@ +Fix an unnecessary ifdef in the include of VersionHelpers.h in socketmodule +on Windows. 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 |