|
|
|
@ -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 |
|
|
|
|
|
|
|
|