From aac29af6785712019d34f1a7f15b3c408a4f68ae Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 13 Oct 2021 19:25:53 +0200 Subject: [PATCH] bpo-45434: pyport.h no longer includes (GH-28914) Include explicitly in C files. Python.h includes . --- Doc/whatsnew/3.11.rst | 3 +++ Include/Python.h | 3 ++- Include/internal/pycore_fileutils.h | 3 +++ Include/pyport.h | 2 -- .../next/C API/2021-10-11-23-03-49.bpo-45434.tsS8I_.rst | 7 +++++-- Modules/_ctypes/_ctypes_test.c | 2 ++ Modules/_gdbmmodule.c | 9 +++++---- Modules/_lzmamodule.c | 1 + Modules/_pickle.c | 2 ++ Modules/_tracemalloc.c | 3 +++ Modules/faulthandler.c | 7 +++++-- Modules/getpath.c | 3 ++- Modules/nismodule.c | 1 + Modules/ossaudiodev.c | 1 + Modules/posixmodule.c | 3 ++- Modules/readline.c | 6 ++++-- Objects/floatobject.c | 1 + Objects/longobject.c | 3 ++- Objects/obmalloc.c | 1 + PC/WinMain.c | 1 + Programs/_freeze_module.c | 1 + Programs/_testembed.c | 1 + Python/dtoa.c | 1 + Python/errors.c | 7 ++++--- Python/fileutils.c | 1 + Python/initconfig.c | 2 ++ Python/preconfig.c | 2 ++ Python/pylifecycle.c | 1 + Python/pystrhex.c | 4 ++-- 29 files changed, 61 insertions(+), 21 deletions(-) diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst index 21a0e1ab9c6..d18711d0b8d 100644 --- a/Doc/whatsnew/3.11.rst +++ b/Doc/whatsnew/3.11.rst @@ -556,6 +556,9 @@ Porting to Python 3.11 * The ```` header file no longer includes ````. C extensions using ```` must now include it explicitly. + The system ```` header provides functions like: + ``malloc()``/``free()``, ``getenv()``, ``strtol()``, ``abs()``, ``strtol()``, + ``exit()`` and ``abort()``. (Contributed by Victor Stinner in :issue:`45434`.) Deprecated diff --git a/Include/Python.h b/Include/Python.h index 8c84c90f9a5..4f62103e302 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -33,7 +33,8 @@ # include #endif -#include +#include // assert() +#include // wchar_t #include "pyport.h" #include "pymacro.h" diff --git a/Include/internal/pycore_fileutils.h b/Include/internal/pycore_fileutils.h index 2316a978294..3464477bce5 100644 --- a/Include/internal/pycore_fileutils.h +++ b/Include/internal/pycore_fileutils.h @@ -88,6 +88,9 @@ extern int _Py_add_relfile(wchar_t *dirname, // ... // _Py_END_SUPPRESS_IPH #if defined _MSC_VER && _MSC_VER >= 1900 + +# include // _set_thread_local_invalid_parameter_handler() + extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler; # define _Py_BEGIN_SUPPRESS_IPH \ { _invalid_parameter_handler _Py_old_handler = \ diff --git a/Include/pyport.h b/Include/pyport.h index 6e4e98020cb..0bec2a9b38f 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -205,8 +205,6 @@ typedef Py_ssize_t Py_ssize_clean_t; * see https://bugs.python.org/issue28126 */ #define Py_MEMCPY memcpy -#include - #ifdef HAVE_IEEEFP_H #include /* needed for 'finite' declaration on some platforms */ #endif diff --git a/Misc/NEWS.d/next/C API/2021-10-11-23-03-49.bpo-45434.tsS8I_.rst b/Misc/NEWS.d/next/C API/2021-10-11-23-03-49.bpo-45434.tsS8I_.rst index c04dda53255..95c5f0d1150 100644 --- a/Misc/NEWS.d/next/C API/2021-10-11-23-03-49.bpo-45434.tsS8I_.rst +++ b/Misc/NEWS.d/next/C API/2021-10-11-23-03-49.bpo-45434.tsS8I_.rst @@ -1,3 +1,6 @@ The ```` header file no longer includes ````. C -extensions using ```` must now include it explicitly. Patch by -Victor Stinner. +extensions using ```` must now include it explicitly. +The system ```` header provides functions like: +``malloc()``/``free()``, ``getenv()``, ``strtol()``, ``abs()``, ``strtol()``, +``exit()`` and ``abort()``. +Patch by Victor Stinner. diff --git a/Modules/_ctypes/_ctypes_test.c b/Modules/_ctypes/_ctypes_test.c index a33d15de9c0..770c96c60d1 100644 --- a/Modules/_ctypes/_ctypes_test.c +++ b/Modules/_ctypes/_ctypes_test.c @@ -4,6 +4,8 @@ #include #endif +#include // qsort() + #define EXPORT(x) Py_EXPORTED_SYMBOL x /* some functions handy for testing */ diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c index efbf331ca30..445500c7ee4 100644 --- a/Modules/_gdbmmodule.c +++ b/Modules/_gdbmmodule.c @@ -5,12 +5,13 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" - -#include -#include -#include #include "gdbm.h" +#include +#include // free() +#include +#include + #if defined(WIN32) && !defined(__CYGWIN__) #include "gdbmerrno.h" extern const char * gdbm_strerror(gdbm_error); diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c index a7156ec7ddf..e50f55b75c5 100644 --- a/Modules/_lzmamodule.c +++ b/Modules/_lzmamodule.c @@ -10,6 +10,7 @@ #include "Python.h" #include "structmember.h" // PyMemberDef +#include // free() #include #include diff --git a/Modules/_pickle.c b/Modules/_pickle.c index e693b506a1e..b5131696981 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -12,6 +12,8 @@ #include "pycore_moduleobject.h" // _PyModule_GetState() #include "structmember.h" // PyMemberDef +#include // strtol() + PyDoc_STRVAR(pickle_module_doc, "Optimized C implementation for the Python pickle module."); diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c index 9ba0ebbbaab..09d273ad280 100644 --- a/Modules/_tracemalloc.c +++ b/Modules/_tracemalloc.c @@ -5,7 +5,10 @@ #include "pycore_hashtable.h" #include +#include // malloc() + #include "clinic/_tracemalloc.c.h" + /*[clinic input] module _tracemalloc [clinic start generated code]*/ diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c index 868b4f4f42d..cb2e2588e19 100644 --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -3,10 +3,13 @@ #include "pycore_pyerrors.h" // _Py_DumpExtensionModules #include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_traceback.h" // _Py_DumpTracebackThreads -#include + +#include "frameobject.h" + #include -#include #include +#include +#include // abort() #if defined(HAVE_PTHREAD_SIGMASK) && !defined(HAVE_BROKEN_PTHREAD_SIGMASK) # include #endif diff --git a/Modules/getpath.c b/Modules/getpath.c index 22e5ef24b5d..1405023b39b 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -6,8 +6,9 @@ #include "pycore_pathconfig.h" #include "osdefs.h" // DELIM -#include +#include // getenv() #include +#include #ifdef __APPLE__ # include diff --git a/Modules/nismodule.c b/Modules/nismodule.c index 6655451ebd2..cdda1a6a2fb 100644 --- a/Modules/nismodule.c +++ b/Modules/nismodule.c @@ -12,6 +12,7 @@ #include "Python.h" +#include // free() #include #include #include diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c index 4f2d9cb8b7c..4bab9a58eb1 100644 --- a/Modules/ossaudiodev.c +++ b/Modules/ossaudiodev.c @@ -21,6 +21,7 @@ #include "Python.h" #include "structmember.h" // PyMemberDef +#include // getenv() #ifdef HAVE_FCNTL_H #include #else diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 9c174ee6b18..667a3339f5b 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -46,7 +46,8 @@ # undef HAVE_FACCESSAT #endif -#include /* needed for ctermid() */ +#include // ctermid() +#include // system() /* * A number of APIs are available on macOS from a certain macOS version. diff --git a/Modules/readline.c b/Modules/readline.c index c79d22f85f8..1b616fc4f3b 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -6,9 +6,11 @@ /* Standard definitions */ #include "Python.h" -#include -#include + #include +#include +#include +#include // free() #include #if defined(HAVE_SETLOCALE) diff --git a/Objects/floatobject.c b/Objects/floatobject.c index d25d97f4cbf..5a8113eca8b 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -13,6 +13,7 @@ #include #include +#include // strtol() /*[clinic input] class float "PyObject *" "&PyFloat_Type" diff --git a/Objects/longobject.c b/Objects/longobject.c index 33fea6491b7..111ef4566cd 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -10,9 +10,10 @@ #include "pycore_pystate.h" // _Py_IsMainInterpreter() #include "longintrepr.h" -#include #include +#include #include +#include // abs() #include "clinic/longobject.c.h" /*[clinic input] diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c index 2d6fedd6cf0..d8d6f6dea0d 100644 --- a/Objects/obmalloc.c +++ b/Objects/obmalloc.c @@ -2,6 +2,7 @@ #include "pycore_pymem.h" // _PyTraceMalloc_Config #include +#include // malloc() /* Defined in tracemalloc.c */ diff --git a/PC/WinMain.c b/PC/WinMain.c index e439bed9ed1..07e21ce3e9f 100644 --- a/PC/WinMain.c +++ b/PC/WinMain.c @@ -4,6 +4,7 @@ #define WIN32_LEAN_AND_MEAN #include +#include /* __argc, __wargv */ int WINAPI wWinMain( HINSTANCE hInstance, /* handle to current instance */ diff --git a/Programs/_freeze_module.c b/Programs/_freeze_module.c index dd90d92e512..316c70d2c78 100644 --- a/Programs/_freeze_module.c +++ b/Programs/_freeze_module.c @@ -12,6 +12,7 @@ #include #include +#include // malloc() #include #include #ifndef MS_WINDOWS diff --git a/Programs/_testembed.c b/Programs/_testembed.c index fa418e27611..b61fe3461bd 100644 --- a/Programs/_testembed.c +++ b/Programs/_testembed.c @@ -11,6 +11,7 @@ #include #include #include +#include // putenv() #include /********************************************************* diff --git a/Python/dtoa.c b/Python/dtoa.c index e629b296426..6c44f689651 100644 --- a/Python/dtoa.c +++ b/Python/dtoa.c @@ -119,6 +119,7 @@ #include "Python.h" #include "pycore_dtoa.h" +#include // exit() /* if PY_NO_SHORT_FLOAT_REPR is defined, then don't even try to compile the following code */ diff --git a/Python/errors.c b/Python/errors.c index f072c214965..519f2d459ef 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -15,12 +15,13 @@ extern char *strerror(int); #endif #endif +#include #ifdef MS_WINDOWS -#include -#include +# include +# include +# include // _sys_nerr #endif -#include #ifdef __cplusplus extern "C" { diff --git a/Python/fileutils.c b/Python/fileutils.c index a36415946e2..173d34dd23f 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -3,6 +3,7 @@ #include "pycore_runtime.h" // _PyRuntime #include "osdefs.h" // SEP #include +#include // mbstowcs() #ifdef MS_WINDOWS # include diff --git a/Python/initconfig.c b/Python/initconfig.c index ba6d19db200..b0d54b0472f 100644 --- a/Python/initconfig.c +++ b/Python/initconfig.c @@ -10,7 +10,9 @@ #include "pycore_pystate.h" // _PyThreadState_GET() #include "osdefs.h" // DELIM + #include // setlocale() +#include // getenv() #if defined(MS_WINDOWS) || defined(__CYGWIN__) # ifdef HAVE_IO_H # include diff --git a/Python/preconfig.c b/Python/preconfig.c index d59273159a6..afa16cccf32 100644 --- a/Python/preconfig.c +++ b/Python/preconfig.c @@ -4,7 +4,9 @@ #include "pycore_initconfig.h" // _PyArgv #include "pycore_pymem.h" // _PyMem_GetAllocatorName() #include "pycore_runtime.h" // _PyRuntime_Initialize() + #include // setlocale() +#include // getenv() /* Forward declarations */ diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index c67a9b7fbfa..c5a209abae6 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -16,6 +16,7 @@ #include "pycore_traceback.h" // _Py_DumpTracebackThreads() #include // setlocale() +#include // getenv() #if defined(__APPLE__) #include diff --git a/Python/pystrhex.c b/Python/pystrhex.c index f7fe3b6eb85..880af44ea0e 100644 --- a/Python/pystrhex.c +++ b/Python/pystrhex.c @@ -1,8 +1,8 @@ /* Format bytes as hexadecimal */ #include "Python.h" -#include "pycore_strhex.h" // _Py_strhex_with_sep() - +#include "pycore_strhex.h" // _Py_strhex_with_sep() +#include // abs() static PyObject *_Py_strhex_impl(const char* argbuf, const Py_ssize_t arglen, const PyObject* sep, int bytes_per_sep_group,