From 673549b980737625271226ab05023a82f473d7b1 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Wed, 11 Sep 2019 14:52:14 +0100 Subject: [PATCH 1/2] bpo-32592: Set Windows 8 as the minimum required version for API support --- .../next/Windows/2019-09-11-14-51-56.bpo-32592.jvQMD9.rst | 1 + PC/pyconfig.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2019-09-11-14-51-56.bpo-32592.jvQMD9.rst 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 00000000000000..c07a1213308e85 --- /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/PC/pyconfig.h b/PC/pyconfig.h index 9304c7257c667b..d407e1d4632af5 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 From dfa7c2819d7c7fc72716f3bcb5dd611d06ae47d6 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Wed, 11 Sep 2019 16:18:18 +0100 Subject: [PATCH 2/2] Remove unnecessary redefinition --- Modules/posixmodule.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 089572f4fdab0e..e71d4b28bd1e67 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);