From cfe5e5ad1b3273514f7f9c84eb7dc4309b7dd7d4 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 18 Oct 2023 00:17:18 +0200 Subject: [PATCH] gh-110968: Py_MOD_PER_INTERPRETER_GIL_SUPPORTED was added to 3.12 --- Include/moduleobject.h | 8 ++++---- Modules/_ctypes/_ctypes_test.c | 4 ++-- Modules/_multiprocessing/posixshmem.c | 4 ++-- Modules/_scproxy.c | 4 ++-- Modules/_stat.c | 2 +- Modules/_testclinic_limited.c | 2 +- Modules/_uuidmodule.c | 4 ++-- Modules/errnomodule.c | 4 ++-- Modules/md5module.c | 4 ++-- Modules/resource.c | 2 +- Modules/xxlimited.c | 4 ++-- PC/winsound.c | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Include/moduleobject.h b/Include/moduleobject.h index 2f7dc254466c46..52a47f10e5953e 100644 --- a/Include/moduleobject.h +++ b/Include/moduleobject.h @@ -82,10 +82,10 @@ struct PyModuleDef_Slot { #endif /* New in 3.5 */ /* for Py_mod_multiple_interpreters: */ -#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030d0000 -#define Py_MOD_MULTIPLE_INTERPRETERS_NOT_SUPPORTED ((void *)0) -#define Py_MOD_MULTIPLE_INTERPRETERS_SUPPORTED ((void *)1) -#define Py_MOD_PER_INTERPRETER_GIL_SUPPORTED ((void *)2) +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030c0000 +# define Py_MOD_MULTIPLE_INTERPRETERS_NOT_SUPPORTED ((void *)0) +# define Py_MOD_MULTIPLE_INTERPRETERS_SUPPORTED ((void *)1) +# define Py_MOD_PER_INTERPRETER_GIL_SUPPORTED ((void *)2) #endif struct PyModuleDef { diff --git a/Modules/_ctypes/_ctypes_test.c b/Modules/_ctypes/_ctypes_test.c index 12d372ff167021..5869d8f952d184 100644 --- a/Modules/_ctypes/_ctypes_test.c +++ b/Modules/_ctypes/_ctypes_test.c @@ -3,8 +3,8 @@ #endif #ifndef Py_NOGIL -// Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED -#define Py_LIMITED_API 0x030d0000 +// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED +#define Py_LIMITED_API 0x030c0000 #endif // gh-85283: On Windows, Py_LIMITED_API requires Py_BUILD_CORE to not attempt diff --git a/Modules/_multiprocessing/posixshmem.c b/Modules/_multiprocessing/posixshmem.c index dc3c59d01e0cb1..b1f776cbbeca3f 100644 --- a/Modules/_multiprocessing/posixshmem.c +++ b/Modules/_multiprocessing/posixshmem.c @@ -5,8 +5,8 @@ posixshmem - A Python extension that provides shm_open() and shm_unlink() #include "pyconfig.h" // Py_NOGIL #ifndef Py_NOGIL -// Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED -#define Py_LIMITED_API 0x030d0000 +// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED +#define Py_LIMITED_API 0x030c0000 #endif #include diff --git a/Modules/_scproxy.c b/Modules/_scproxy.c index c8e120e24b18b9..9f7a65c91e2d33 100644 --- a/Modules/_scproxy.c +++ b/Modules/_scproxy.c @@ -8,8 +8,8 @@ #endif #ifndef Py_NOGIL -// Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED -#define Py_LIMITED_API 0x030d0000 +// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED +#define Py_LIMITED_API 0x030c0000 #endif #include diff --git a/Modules/_stat.c b/Modules/_stat.c index d0035608aad0b3..9e278d6dcd1589 100644 --- a/Modules/_stat.c +++ b/Modules/_stat.c @@ -15,8 +15,8 @@ #include "pyconfig.h" // Py_NOGIL #endif -// Need limited C API version 3.13 for PyModule_Add() on Windows #ifndef Py_NOGIL +// Need limited C API version 3.13 for PyModule_Add() on Windows #define Py_LIMITED_API 0x030d0000 #endif diff --git a/Modules/_testclinic_limited.c b/Modules/_testclinic_limited.c index 63ebb5292602f8..c5d07e1370dac8 100644 --- a/Modules/_testclinic_limited.c +++ b/Modules/_testclinic_limited.c @@ -8,8 +8,8 @@ #include "pyconfig.h" // Py_NOGIL #endif -// For now, only limited C API 3.13 is supported #ifndef Py_NOGIL +// For now, only limited C API 3.13 is supported #define Py_LIMITED_API 0x030d0000 #endif diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c index 8bda1d602473a1..1d716051df4ade 100644 --- a/Modules/_uuidmodule.c +++ b/Modules/_uuidmodule.c @@ -8,8 +8,8 @@ #endif #ifndef Py_NOGIL -// Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED -#define Py_LIMITED_API 0x030d0000 +// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED +#define Py_LIMITED_API 0x030c0000 #endif #include "Python.h" diff --git a/Modules/errnomodule.c b/Modules/errnomodule.c index 5ac4d298343254..1e2c55a1a26b4b 100644 --- a/Modules/errnomodule.c +++ b/Modules/errnomodule.c @@ -5,8 +5,8 @@ #endif #ifndef Py_NOGIL -// Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED -#define Py_LIMITED_API 0x030d0000 +// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED +#define Py_LIMITED_API 0x030c0000 #endif #include "Python.h" diff --git a/Modules/md5module.c b/Modules/md5module.c index ff7fc09bca3996..7883a8cbe6e246 100644 --- a/Modules/md5module.c +++ b/Modules/md5module.c @@ -21,8 +21,8 @@ #endif #ifndef Py_NOGIL -// Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED -#define Py_LIMITED_API 0x030d0000 +// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED +#define Py_LIMITED_API 0x030c0000 #endif #include "Python.h" diff --git a/Modules/resource.c b/Modules/resource.c index eb9c2e27fdba85..87c44607df1c4c 100644 --- a/Modules/resource.c +++ b/Modules/resource.c @@ -3,7 +3,7 @@ #endif #ifndef Py_NOGIL -// Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED +// Need limited C API version 3.13 for PySys_Audit() #define Py_LIMITED_API 0x030d0000 #endif diff --git a/Modules/xxlimited.c b/Modules/xxlimited.c index 3dcf74ab1190d1..21d7e9ba67ad78 100644 --- a/Modules/xxlimited.c +++ b/Modules/xxlimited.c @@ -67,8 +67,8 @@ #endif #ifndef Py_NOGIL -// Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED -#define Py_LIMITED_API 0x030d0000 +// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED +#define Py_LIMITED_API 0x030c0000 #endif #include "Python.h" diff --git a/PC/winsound.c b/PC/winsound.c index 36e4d07420e650..d1ff991c934bae 100644 --- a/PC/winsound.c +++ b/PC/winsound.c @@ -36,8 +36,8 @@ */ #ifndef Py_NOGIL -// Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED -#define Py_LIMITED_API 0x030d0000 +// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED +#define Py_LIMITED_API 0x030c0000 #endif #include