From 2ac0515027699b5694d9a6ff40f1ddaba82c74c2 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 1 Apr 2021 15:09:33 +0200 Subject: bpo-43688: Fix Py_LIMITED_API version of xxlimited (GH-25135) xxlimited targets Python 3.10, not Python 3.16: fix the hexadecimal version number used in the Py_LIMITED_API macro. --- Include/methodobject.h | 8 ++++---- PCbuild/xxlimited.vcxproj | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Include/methodobject.h b/Include/methodobject.h index 7aa4e41..9ffe8e1 100644 --- a/Include/methodobject.h +++ b/Include/methodobject.h @@ -79,15 +79,15 @@ PyAPI_FUNC(PyObject *) PyCMethod_New(PyMethodDef *, PyObject *, #define METH_COEXIST 0x0040 -#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03100000 -#define METH_FASTCALL 0x0080 +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030a0000 +# define METH_FASTCALL 0x0080 #endif /* This bit is preserved for Stackless Python */ #ifdef STACKLESS -#define METH_STACKLESS 0x0100 +# define METH_STACKLESS 0x0100 #else -#define METH_STACKLESS 0x0000 +# define METH_STACKLESS 0x0000 #endif /* METH_METHOD means the function stores an diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj index ece1691..61e4e57 100644 --- a/PCbuild/xxlimited.vcxproj +++ b/PCbuild/xxlimited.vcxproj @@ -94,7 +94,7 @@ - %(PreprocessorDefinitions);Py_LIMITED_API=0x03100000 + %(PreprocessorDefinitions);Py_LIMITED_API=0x030A0000 wsock32.lib;%(AdditionalDependencies) diff --git a/setup.py b/setup.py index e3fbd78..75bd163 100644 --- a/setup.py +++ b/setup.py @@ -1867,7 +1867,7 @@ class PyBuildExt(build_ext): if 'd' not in sysconfig.get_config_var('ABIFLAGS'): # Non-debug mode: Build xxlimited with limited API self.add(Extension('xxlimited', ['xxlimited.c'], - define_macros=[('Py_LIMITED_API', '0x03100000')])) + define_macros=[('Py_LIMITED_API', '0x030a0000')])) self.add(Extension('xxlimited_35', ['xxlimited_35.c'], define_macros=[('Py_LIMITED_API', '0x03050000')])) else: -- cgit v0.12