diff options
| author | Victor Stinner <vstinner@python.org> | 2021-10-19 10:10:22 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-19 10:10:22 (GMT) |
| commit | 52af0756b2ffc6788e364971d05cdaf127d77d5a (patch) | |
| tree | 8a2175ea934e639eac93bf33b5a22efde8979e9c /Include | |
| parent | 0a4c82ddd34a3578684b45b76f49cd289a08740b (diff) | |
| download | cpython-52af0756b2ffc6788e364971d05cdaf127d77d5a.zip cpython-52af0756b2ffc6788e364971d05cdaf127d77d5a.tar.gz cpython-52af0756b2ffc6788e364971d05cdaf127d77d5a.tar.bz2 | |
bpo-45434: Only exclude <stdlib.h> in Python 3.11 limited C API (GH-29027)
The Python 3.11 limited C API no longer includes stdlib.h, stdio.h,
string.h and errno.h.
* Exclude Py_MEMCPY() from Python 3.11 limited C API.
* xxlimited C extension is now built with Python 3.11 limited C API.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/Python.h | 10 | ||||
| -rw-r--r-- | Include/pyport.h | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/Include/Python.h b/Include/Python.h index c0a621a..6e3303a 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -16,12 +16,14 @@ # define _SGI_MP_SOURCE #endif -#include <string.h> // memcpy() -#ifndef Py_LIMITED_API +// stdlib.h, stdio.h, errno.h and string.h headers are not used by Python +// headers, but kept for backward compatibility. They are excluded from the +// limited C API of Python 3.11. +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000 +# include <stdlib.h> # include <stdio.h> // FILE* -#endif -#ifdef HAVE_ERRNO_H # include <errno.h> // errno +# include <string.h> // memcpy() #endif #ifndef MS_WINDOWS # include <unistd.h> diff --git a/Include/pyport.h b/Include/pyport.h index 0bec2a9..61ca3a9 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -201,9 +201,10 @@ typedef Py_ssize_t Py_ssize_clean_t; # define Py_LOCAL_INLINE(type) static inline type #endif -/* Py_MEMCPY is kept for backwards compatibility, - * see https://bugs.python.org/issue28126 */ -#define Py_MEMCPY memcpy +// bpo-28126: Py_MEMCPY is kept for backwards compatibility, +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000 +# define Py_MEMCPY memcpy +#endif #ifdef HAVE_IEEEFP_H #include <ieeefp.h> /* needed for 'finite' declaration on some platforms */ |