summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@python.org>2019-09-11 17:03:37 +0100
committerZachary Ware <zachary.ware@gmail.com>2019-09-11 17:03:37 +0100
commit0b72ccff56fb47e14f7b1f6590eafff8d104c229 (patch)
tree05acee2cd93a5c92d75dc50662182b773a980651
parente6557d3c62800f51ee6530c94a10b93d725504fa (diff)
downloadcpython-git-0b72ccff56fb47e14f7b1f6590eafff8d104c229.tar.gz
bpo-32592: Set Windows 8 as the minimum required version for API support (GH-15951)
-rw-r--r--Misc/NEWS.d/next/Windows/2019-09-11-14-51-56.bpo-32592.jvQMD9.rst1
-rw-r--r--Modules/posixmodule.c2
-rw-r--r--PC/pyconfig.h6
3 files changed, 4 insertions, 5 deletions
diff --git a/Misc/NEWS.d/next/Windows/2019-09-11-14-51-56.bpo-32592.jvQMD9.rst b/Misc/NEWS.d/next/Windows/2019-09-11-14-51-56.bpo-32592.jvQMD9.rst
new file mode 100644
index 0000000000..c07a121330
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2019-09-11-14-51-56.bpo-32592.jvQMD9.rst
@@ -0,0 +1 @@
+Set Windows 8 as the minimum required version for API support
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 089572f4fd..e71d4b28bd 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -12204,8 +12204,6 @@ os_cpu_count_impl(PyObject *module)
{
int ncpu = 0;
#ifdef MS_WINDOWS
- /* Declare prototype here to avoid pulling in all of the Win7 APIs in 3.8 */
- DWORD WINAPI GetActiveProcessorCount(WORD group);
ncpu = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS);
#elif defined(__hpux)
ncpu = mpctl(MPC_GETNUMSPUS, NULL, NULL);
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 9304c7257c..d407e1d463 100644
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -135,9 +135,9 @@ WIN32 is still required for the locale module.
#endif /* MS_WIN64 */
/* set the version macros for the windows headers */
-/* Python 3.5+ requires Windows Vista or greater */
-#define Py_WINVER 0x0600 /* _WIN32_WINNT_VISTA */
-#define Py_NTDDI NTDDI_VISTA
+/* Python 3.9+ requires Windows 8 or greater */
+#define Py_WINVER 0x0602 /* _WIN32_WINNT_WIN8 */
+#define Py_NTDDI NTDDI_WIN8
/* We only set these values when building Python - we don't want to force
these values on extensions, as that will affect the prototypes and