diff options
| author | shadchin <[email protected]> | 2025-06-13 00:05:26 +0300 |
|---|---|---|
| committer | shadchin <[email protected]> | 2025-06-13 00:35:30 +0300 |
| commit | 796b9088366b10b4cd42885101fc20c0b5709b07 (patch) | |
| tree | f287eacb0b95ffd7cabf95b16cafb4788645dc38 /contrib/tools/python3/Include | |
| parent | c72bca862651e507d2ff4980ef7f4ff7267a7227 (diff) | |
Update Python 3 to 3.12.10
commit_hash:dd2398e159fe1d72ea6b12da52fccc933a41a785
Diffstat (limited to 'contrib/tools/python3/Include')
4 files changed, 12 insertions, 5 deletions
diff --git a/contrib/tools/python3/Include/cpython/pythread.h b/contrib/tools/python3/Include/cpython/pythread.h index 449b7cc6ddd..a09a9a5c464 100644 --- a/contrib/tools/python3/Include/cpython/pythread.h +++ b/contrib/tools/python3/Include/cpython/pythread.h @@ -21,7 +21,7 @@ PyAPI_FUNC(int) _PyThread_at_fork_reinit(PyThread_type_lock *lock); */ # define NATIVE_TSS_KEY_T unsigned long #elif defined(HAVE_PTHREAD_STUBS) -#error # include "cpython/pthread_stubs.h" +# include "pthread_stubs.h" # define NATIVE_TSS_KEY_T pthread_key_t #else # error "Require native threads. See https://bugs.python.org/issue31370" diff --git a/contrib/tools/python3/Include/internal/pycore_condvar.h b/contrib/tools/python3/Include/internal/pycore_condvar.h index 981c962bf7d..2177bed31fc 100644 --- a/contrib/tools/python3/Include/internal/pycore_condvar.h +++ b/contrib/tools/python3/Include/internal/pycore_condvar.h @@ -37,8 +37,10 @@ #define Py_HAVE_CONDVAR /* include windows if it hasn't been done before */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +#ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif +#include <windows.h> // CRITICAL_SECTION /* options */ /* non-emulated condition variables are provided for those that want diff --git a/contrib/tools/python3/Include/internal/pycore_sysmodule.h b/contrib/tools/python3/Include/internal/pycore_sysmodule.h index b4b1febafa4..e76c2691002 100644 --- a/contrib/tools/python3/Include/internal/pycore_sysmodule.h +++ b/contrib/tools/python3/Include/internal/pycore_sysmodule.h @@ -8,6 +8,11 @@ extern "C" { # error "this header requires Py_BUILD_CORE define" #endif +PyAPI_FUNC(int) _PySys_GetOptionalAttr(PyObject *, PyObject **); +PyAPI_FUNC(int) _PySys_GetOptionalAttrString(const char *, PyObject **); +PyAPI_FUNC(PyObject *) _PySys_GetRequiredAttr(PyObject *); +PyAPI_FUNC(PyObject *) _PySys_GetRequiredAttrString(const char *); + PyAPI_FUNC(int) _PySys_Audit( PyThreadState *tstate, const char *event, diff --git a/contrib/tools/python3/Include/patchlevel.h b/contrib/tools/python3/Include/patchlevel.h index 3a80c5f879c..b982ff713da 100644 --- a/contrib/tools/python3/Include/patchlevel.h +++ b/contrib/tools/python3/Include/patchlevel.h @@ -18,12 +18,12 @@ /*--start constants--*/ #define PY_MAJOR_VERSION 3 #define PY_MINOR_VERSION 12 -#define PY_MICRO_VERSION 9 +#define PY_MICRO_VERSION 10 #define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL #define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "3.12.9" +#define PY_VERSION "3.12.10" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. |