https://github.com/python/cpython/commit/00cf2a621a21357b09bc7ae6f0ce0b799b1fa17f commit: 00cf2a621a21357b09bc7ae6f0ce0b799b1fa17f branch: 3.13 author: Bénédikt Tran <10796600+picn...@users.noreply.github.com> committer: picnixz <10796600+picn...@users.noreply.github.com> date: 2025-03-03T13:09:59+01:00 summary:
[3.13] gh-130740: Move some `stdbool.h` includes after `Python.h` (#130738) (#130756) gh-130740: Move some `stdbool.h` includes after `Python.h` (#130738) Move some `#include <stdbool.h>` after `#include "Python.h"` when `pyconfig.h` is not included first and when we are in a platform-agnostic context. This is to avoid having features defined by `stdbool.h` before those decided by `Python.h` (this caused some build failures when compiling CPython with `zig cc`). (cherry-picked from commit 214562ed4ddc248b007f718ed92ebcc0c3669611) --------- Co-authored-by: Hugo Beauzée-Luyssen <h...@beauzee.fr> files: A Misc/NEWS.d/next/Build/2025-03-01-18-27-42.gh-issue-130740.nDFSHR.rst M Modules/_blake2/blake2b_impl.c M Modules/_blake2/blake2s_impl.c M Modules/_hashopenssl.c M Parser/string_parser.c M Python/flowgraph.c M Python/instruction_sequence.c diff --git a/Misc/NEWS.d/next/Build/2025-03-01-18-27-42.gh-issue-130740.nDFSHR.rst b/Misc/NEWS.d/next/Build/2025-03-01-18-27-42.gh-issue-130740.nDFSHR.rst new file mode 100644 index 00000000000000..61d416c69f0c30 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-03-01-18-27-42.gh-issue-130740.nDFSHR.rst @@ -0,0 +1,2 @@ +Ensure that ``Python.h`` is included before ``stdbool.h`` unless ``pyconfig.h`` +is included before or in some platform-specific contexts. diff --git a/Modules/_blake2/blake2b_impl.c b/Modules/_blake2/blake2b_impl.c index 0c3ae5a2fac275..370d01d55790b5 100644 --- a/Modules/_blake2/blake2b_impl.c +++ b/Modules/_blake2/blake2b_impl.c @@ -17,10 +17,11 @@ # define Py_BUILD_CORE_MODULE 1 #endif -#include <stdbool.h> #include "Python.h" #include "pycore_strhex.h" // _Py_strhex() +#include <stdbool.h> + #include "../hashlib.h" #include "blake2module.h" diff --git a/Modules/_blake2/blake2s_impl.c b/Modules/_blake2/blake2s_impl.c index 3014773ab52331..0935866092c882 100644 --- a/Modules/_blake2/blake2s_impl.c +++ b/Modules/_blake2/blake2s_impl.c @@ -17,10 +17,11 @@ # define Py_BUILD_CORE_MODULE 1 #endif -#include <stdbool.h> #include "Python.h" #include "pycore_strhex.h" // _Py_strhex() +#include <stdbool.h> + #include "../hashlib.h" #include "blake2module.h" diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index fef0ed4a0b8844..7e54e6f4d0290c 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -22,7 +22,6 @@ # define Py_BUILD_CORE_MODULE 1 #endif -#include <stdbool.h> #include "Python.h" #include "pycore_hashtable.h" #include "pycore_pyhash.h" // _Py_HashBytes() @@ -38,6 +37,7 @@ #include <openssl/objects.h> #include <openssl/err.h> +#include <stdbool.h> #ifndef OPENSSL_THREADS # error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL" diff --git a/Parser/string_parser.c b/Parser/string_parser.c index e92984935430ce..ce96b6e7b44f50 100644 --- a/Parser/string_parser.c +++ b/Parser/string_parser.c @@ -1,5 +1,3 @@ -#include <stdbool.h> - #include <Python.h> #include "pycore_bytesobject.h" // _PyBytes_DecodeEscape() #include "pycore_unicodeobject.h" // _PyUnicode_DecodeUnicodeEscapeInternal() @@ -8,6 +6,8 @@ #include "pegen.h" #include "string_parser.h" +#include <stdbool.h> + //// STRING HANDLING FUNCTIONS //// static int diff --git a/Python/flowgraph.c b/Python/flowgraph.c index ff70e47370241a..ecf510842ea748 100644 --- a/Python/flowgraph.c +++ b/Python/flowgraph.c @@ -1,6 +1,3 @@ - -#include <stdbool.h> - #include "Python.h" #include "pycore_flowgraph.h" #include "pycore_compile.h" @@ -9,6 +6,8 @@ #include "pycore_opcode_utils.h" #include "pycore_opcode_metadata.h" // OPCODE_HAS_ARG, etc +#include <stdbool.h> + #undef SUCCESS #undef ERROR diff --git a/Python/instruction_sequence.c b/Python/instruction_sequence.c index a3f85f754d71bb..e713ebb9b8734e 100644 --- a/Python/instruction_sequence.c +++ b/Python/instruction_sequence.c @@ -5,8 +5,6 @@ */ -#include <stdbool.h> - #include "Python.h" #include "pycore_compile.h" // _PyCompile_EnsureArrayLargeEnough @@ -22,6 +20,8 @@ typedef _Py_SourceLocation location; #include "clinic/instruction_sequence.c.h" +#include <stdbool.h> + #undef SUCCESS #undef ERROR #define SUCCESS 0 _______________________________________________ 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
