https://github.com/python/cpython/commit/830f04b5056db92ba96387db0a778dcd19a39522 commit: 830f04b5056db92ba96387db0a778dcd19a39522 branch: main author: Hugo Beauzée-Luyssen <h...@beauzee.fr> committer: vstinner <vstin...@python.org> date: 2025-02-28T10:09:27+01:00 summary:
Postpone <stdbool.h> inclusion after Python.h (#130641) Remove inclusions prior to Python.h. <stdbool.h> will cause <features.h> to be included before Python.h can define some macros to enable some additional features, causing multiple types not to be defined down the line. files: M Objects/codeobject.c M Python/assemble.c M Python/compile.c M Python/pythonrun.c diff --git a/Objects/codeobject.c b/Objects/codeobject.c index a7b46aa2dfbbc0..833c4d10ba8318 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -1,5 +1,3 @@ -#include <stdbool.h> - #include "Python.h" #include "opcode.h" @@ -20,6 +18,8 @@ #include "pycore_uniqueid.h" // _PyObject_AssignUniqueId() #include "clinic/codeobject.c.h" +#include <stdbool.h> + #define INITIAL_SPECIALIZED_CODE_SIZE 16 static const char * diff --git a/Python/assemble.c b/Python/assemble.c index f7b88b519f5f71..6dcac332f076d8 100644 --- a/Python/assemble.c +++ b/Python/assemble.c @@ -1,5 +1,3 @@ -#include <stdbool.h> - #include "Python.h" #include "pycore_code.h" // write_location_entry_start() #include "pycore_compile.h" @@ -8,6 +6,7 @@ #include "pycore_opcode_metadata.h" // is_pseudo_target, _PyOpcode_Caches #include "pycore_symtable.h" // _Py_SourceLocation +#include <stdbool.h> #define DEFAULT_CODE_SIZE 128 #define DEFAULT_LNOTAB_SIZE 16 diff --git a/Python/compile.c b/Python/compile.c index b58c12d4b881ac..cd68b897cf6188 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -14,8 +14,6 @@ * */ -#include <stdbool.h> - #include "Python.h" #include "pycore_ast.h" // PyAST_Check, _PyAST_GetDocString() #include "pycore_compile.h" @@ -25,6 +23,8 @@ #include "cpython/code.h" +#include <stdbool.h> + #undef SUCCESS #undef ERROR #define SUCCESS 0 diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 9b882d982a9e50..75d91b2040cdd5 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -8,8 +8,6 @@ /* TODO: Cull includes following phase split */ -#include <stdbool.h> - #include "Python.h" #include "pycore_ast.h" // PyAST_mod2obj() @@ -29,6 +27,8 @@ #include "errcode.h" // E_EOF #include "marshal.h" // PyMarshal_ReadLongFromFile() +#include <stdbool.h> + #ifdef MS_WINDOWS # include "malloc.h" // alloca() #endif _______________________________________________ Python-checkins mailing list -- python-checkins@python.org To unsubscribe send an email to python-checkins-le...@python.org https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: arch...@mail-archive.com
