diff options
| author | Carl Meyer <carl@oddbird.net> | 2018-05-17 18:03:59 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2018-05-17 18:03:59 (GMT) |
| commit | c0ee341b29bd7d978b49272a2c0e2dcfa77404d5 (patch) | |
| tree | e0655587b113e53abcf40bf27b7ac2ea392efde8 | |
| parent | 631753fcc5e88bbbad402933e77295675cfe1fee (diff) | |
| download | cpython-c0ee341b29bd7d978b49272a2c0e2dcfa77404d5.zip cpython-c0ee341b29bd7d978b49272a2c0e2dcfa77404d5.tar.gz cpython-c0ee341b29bd7d978b49272a2c0e2dcfa77404d5.tar.bz2 | |
Fix Windows build of Python for latest WinSDK. (GH-6874)
| -rw-r--r-- | Modules/_io/_iomodule.c | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index 11d7b01..6674465 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -21,7 +21,7 @@ #endif /* HAVE_SYS_STAT_H */ #ifdef MS_WINDOWS -#include <consoleapi.h> +#include <Windows.h> #endif /* Various interned strings */ diff --git a/PCbuild/python.props b/PCbuild/python.props index f7adaf4..fc0b661 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -77,7 +77,8 @@ --> <_RegistryVersion>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</_RegistryVersion> <_RegistryVersion Condition="$(_RegistryVersion) == ''">$(Registry:HKEY_LOCAL_MACHINE\WOW6432Node\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</_RegistryVersion> - <DefaultWindowsSDKVersion>10.0.16299.0</DefaultWindowsSDKVersion> + <DefaultWindowsSDKVersion>10.0.17134.0</DefaultWindowsSDKVersion> + <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.16299'">10.0.16299.0</DefaultWindowsSDKVersion> <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion> <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion> <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion> |