bpo-41111: xxlimited.c defines Py_LIMITED_API (GH-25151)
xxlimited.c and xxlimited_35.c now define the Py_LIMITED_API macro,
rather than having to do it in the build recipe.
Co-authored-by: Hai Shi <shihai1992@gmail.com>
diff --git a/Modules/xxlimited.c b/Modules/xxlimited.c
index 883c8a9..c3d98d3 100644
--- a/Modules/xxlimited.c
+++ b/Modules/xxlimited.c
@@ -55,6 +55,8 @@
pass
*/
+#define Py_LIMITED_API 0x030a0000
+
#include "Python.h"
// Module state
diff --git a/Modules/xxlimited_35.c b/Modules/xxlimited_35.c
index ce96e8c..5e93854 100644
--- a/Modules/xxlimited_35.c
+++ b/Modules/xxlimited_35.c
@@ -5,10 +5,12 @@
* See the xxlimited module for an extension module template.
*/
-/* Xxo objects */
+#define Py_LIMITED_API 0x03050000
#include "Python.h"
+/* Xxo objects */
+
static PyObject *ErrorObject;
typedef struct {
diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj
index 61e4e57..1c776fb 100644
--- a/PCbuild/xxlimited.vcxproj
+++ b/PCbuild/xxlimited.vcxproj
@@ -93,9 +93,6 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
- <ClCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions);Py_LIMITED_API=0x030A0000</PreprocessorDefinitions>
- </ClCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
diff --git a/PCbuild/xxlimited_35.vcxproj b/PCbuild/xxlimited_35.vcxproj
index 7e49ead..dd830b3 100644
--- a/PCbuild/xxlimited_35.vcxproj
+++ b/PCbuild/xxlimited_35.vcxproj
@@ -93,9 +93,6 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
- <ClCompile>
- <PreprocessorDefinitions>%(PreprocessorDefinitions);Py_LIMITED_API=0x03060000</PreprocessorDefinitions>
- </ClCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
diff --git a/setup.py b/setup.py
index 3b4e7ae..edf3cb4 100644
--- a/setup.py
+++ b/setup.py
@@ -1865,10 +1865,8 @@
## self.add(Extension('xx', ['xxmodule.c']))
# Limited C API
- self.add(Extension('xxlimited', ['xxlimited.c'],
- define_macros=[('Py_LIMITED_API', '0x030a0000')]))
- self.add(Extension('xxlimited_35', ['xxlimited_35.c'],
- define_macros=[('Py_LIMITED_API', '0x03050000')]))
+ self.add(Extension('xxlimited', ['xxlimited.c']))
+ self.add(Extension('xxlimited_35', ['xxlimited_35.c']))
def detect_tkinter_fromenv(self):
# Build _tkinter using the Tcl/Tk locations specified by
