mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #22919: Windows build updated to support VC 14.0 (Visual Studio 2015), which will be used for the official 3.5 release.

Browse source
This commit is contained in:
Steve Dower 2014-11-22 12:54:57 -08:00
parent 92716777b8
commit 65e4cb10d9
144 changed files with 2494 additions and 26822 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Modules/socketmodule.c
View file

@ -284,6 +284,11 @@ if_indextoname(index) -- return the corresponding interface name\n\
# include <fcntl.h>
# endif
#if defined(_MSC_VER) && _MSC_VER >= 1800
/* Provides the IsWindows7SP1OrGreater() function */
#include <VersionHelpers.h>
#endif
#endif
#include <stddef.h>
@ -5845,11 +5850,15 @@ 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 && minor >= 1);
support_wsa_no_inherit = major > 6 || (major == 6 && minor >= 1);
#endif
}
#endif