From 240bcf82a11fe7433a61da70605e924c53b88096 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 2 Apr 2021 16:48:11 +0200 Subject: [PATCH] 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 --- Modules/xxlimited.c | 2 ++ Modules/xxlimited_35.c | 4 +++- PCbuild/xxlimited.vcxproj | 3 --- PCbuild/xxlimited_35.vcxproj | 3 --- setup.py | 6 ++---- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Modules/xxlimited.c b/Modules/xxlimited.c index 883c8a9b5e1..c3d98d34eb5 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 ce96e8c90ef..5e93854f685 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 61e4e5784e7..1c776fb0da3 100644 --- a/PCbuild/xxlimited.vcxproj +++ b/PCbuild/xxlimited.vcxproj @@ -93,9 +93,6 @@ <_ProjectFileVersion>10.0.30319.1 - - %(PreprocessorDefinitions);Py_LIMITED_API=0x030A0000 - wsock32.lib;%(AdditionalDependencies) diff --git a/PCbuild/xxlimited_35.vcxproj b/PCbuild/xxlimited_35.vcxproj index 7e49eadf903..dd830b3b6aa 100644 --- a/PCbuild/xxlimited_35.vcxproj +++ b/PCbuild/xxlimited_35.vcxproj @@ -93,9 +93,6 @@ <_ProjectFileVersion>10.0.30319.1 - - %(PreprocessorDefinitions);Py_LIMITED_API=0x03060000 - wsock32.lib;%(AdditionalDependencies) diff --git a/setup.py b/setup.py index 3b4e7ae70a4..edf3cb4f230 100644 --- a/setup.py +++ b/setup.py @@ -1865,10 +1865,8 @@ def detect_modules(self): ## 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