Fix Windows build of Python for latest WinSDK. (GH-6874) (GH-6952)

(cherry picked from commit c0ee341b29bd7d978b49272a2c0e2dcfa77404d5)

Co-authored-by: Carl Meyer <carl@oddbird.net>

diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
index 11d7b01883113af04f2e1de4e14f75c459eda34c..667446526a0bb49759013f1f791a2470059318c9 100644 (file)
--- 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 f7adaf47db66d9396e97d89708f70edac7c6b9ea..fc0b6618ca73ea5d8e415fbdfdf0e3a1976c99d0 100644 (file)
--- 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>