summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2021-04-01 13:09:33 (GMT)
committerGitHub <noreply@github.com>2021-04-01 13:09:33 (GMT)
commit2ac0515027699b5694d9a6ff40f1ddaba82c74c2 (patch)
tree75a0082d9f3ec7f987ada46a85fe4acdd4311cfd
parent61092a99c4840f36dbde8457cb566fc3c012930f (diff)
downloadcpython-2ac0515027699b5694d9a6ff40f1ddaba82c74c2.zip
cpython-2ac0515027699b5694d9a6ff40f1ddaba82c74c2.tar.gz
cpython-2ac0515027699b5694d9a6ff40f1ddaba82c74c2.tar.bz2
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.
-rw-r--r--Include/methodobject.h8
-rw-r--r--PCbuild/xxlimited.vcxproj2
-rw-r--r--setup.py2
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 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions);Py_LIMITED_API=0x03100000</PreprocessorDefinitions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions);Py_LIMITED_API=0x030A0000</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</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: