From: Carl Meyer <carl@oddbird.net>
Date: Thu, 17 May 2018 18:03:59 +0000 (-0400)
Subject: Fix Windows build of Python for latest WinSDK. (GH-6874)
X-Git-Tag: v3.8.0a1~1814
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0ee341b29bd7d978b49272a2c0e2dcfa77404d5;p=thirdparty%2FPython%2Fcpython.git

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

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