[Python-checkins] Fix Windows build of Python for latest WinSDK. (GH-6874) (GH-6952)
Steve Dower
webhook-mailer at python.org
Thu May 17 15:35:30 EDT 2018
https://github.com/python/cpython/commit/df4852cbe4b757e8b79506d73a09ec8a1b595970
commit: df4852cbe4b757e8b79506d73a09ec8a1b595970
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Steve Dower <steve.dower at microsoft.com>
date: 2018-05-17T15:35:27-04:00
summary:
Fix Windows build of Python for latest WinSDK. (GH-6874) (GH-6952)
(cherry picked from commit c0ee341b29bd7d978b49272a2c0e2dcfa77404d5)
Co-authored-by: Carl Meyer <carl at oddbird.net>
files:
M Modules/_io/_iomodule.c
M PCbuild/python.props
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
index 11d7b0188311..667446526a0b 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 f7adaf47db66..fc0b6618ca73 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 at ProductVersion)</_RegistryVersion>
<_RegistryVersion Condition="$(_RegistryVersion) == ''">$(Registry:HKEY_LOCAL_MACHINE\WOW6432Node\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0 at 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>
More information about the Python-checkins
mailing list