mirror of
https://github.com/python/cpython.git
synced 2026-01-04 22:42:14 +00:00
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 214562ed4d)
---------
Co-authored-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
This commit is contained in:
parent
519dec97e7
commit
7ce5f15981
9 changed files with 18 additions and 13 deletions
|
|
@ -1,11 +1,10 @@
|
|||
#include <stdbool.h>
|
||||
|
||||
#include "Python.h"
|
||||
#include "pycore_code.h" // write_location_entry_start()
|
||||
#include "pycore_compile.h"
|
||||
#include "pycore_opcode.h" // _PyOpcode_Caches[] and opcode category macros
|
||||
#include "pycore_pymem.h" // _PyMem_IsPtrFreed()
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
#define DEFAULT_CODE_SIZE 128
|
||||
#define DEFAULT_LNOTAB_SIZE 16
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@
|
|||
* objects.
|
||||
*/
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "Python.h"
|
||||
#include "pycore_ast.h" // _PyAST_GetDocString()
|
||||
#define NEED_OPCODE_TABLES
|
||||
|
|
@ -38,6 +36,8 @@
|
|||
|
||||
#include "opcode_metadata.h" // _PyOpcode_opcode_metadata, _PyOpcode_num_popped/pushed
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
#define DEFAULT_CODE_SIZE 128
|
||||
#define DEFAULT_LNOTAB_SIZE 16
|
||||
#define DEFAULT_CNOTAB_SIZE 32
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "Python.h"
|
||||
#include "pycore_flowgraph.h"
|
||||
#include "pycore_compile.h"
|
||||
|
|
@ -11,6 +8,8 @@
|
|||
#include "opcode_metadata.h" // _PyOpcode_opcode_metadata, _PyOpcode_num_popped/pushed
|
||||
#undef NEED_OPCODE_METADATA
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
|
||||
#undef SUCCESS
|
||||
#undef ERROR
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
// Python/bytecodes.c
|
||||
// Do not edit!
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
#ifndef NEED_OPCODE_METADATA
|
||||
extern int _PyOpcode_num_popped(int opcode, int oparg, bool jump);
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@
|
|||
|
||||
/* TODO: Cull includes following phase split */
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "Python.h"
|
||||
|
||||
#include "pycore_ast.h" // PyAST_mod2obj
|
||||
|
|
@ -27,6 +25,8 @@
|
|||
#include "errcode.h" // E_EOF
|
||||
#include "marshal.h" // PyMarshal_ReadLongFromFile()
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
#ifdef MS_WINDOWS
|
||||
# include "malloc.h" // alloca()
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue