From 6c776abb90be09d2b9e53d9b06b56a2e7004b57c Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 20 Mar 2025 01:47:30 +0100 Subject: gh-131238: Cleanup pycore_runtime.h includes (#131486) --- Include/internal/pycore_emscripten_trampoline.h | 2 +- Include/internal/pycore_long.h | 4 +--- Include/internal/pycore_object.h | 1 + Include/internal/pycore_pylifecycle.h | 2 +- Include/internal/pycore_unicodeobject.h | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Include/internal/pycore_emscripten_trampoline.h b/Include/internal/pycore_emscripten_trampoline.h index 5546ebb..7946eb5 100644 --- a/Include/internal/pycore_emscripten_trampoline.h +++ b/Include/internal/pycore_emscripten_trampoline.h @@ -1,7 +1,7 @@ #ifndef Py_EMSCRIPTEN_TRAMPOLINE_H #define Py_EMSCRIPTEN_TRAMPOLINE_H -#include "pycore_runtime.h" // _PyRuntimeState +#include "pycore_typedefs.h" // _PyRuntimeState /** * C function call trampolines to mitigate bad function pointer casts. diff --git a/Include/internal/pycore_long.h b/Include/internal/pycore_long.h index 7b7f4e7..ed6c435 100644 --- a/Include/internal/pycore_long.h +++ b/Include/internal/pycore_long.h @@ -9,9 +9,7 @@ extern "C" { #endif #include "pycore_bytesobject.h" // _PyBytesWriter -#include "pycore_runtime_structs.h"// _PY_NSMALLNEGINTS -#include "pycore_global_objects.h"// _PY_SINGLETON -#include "pycore_runtime.h" // _PyRuntime +#include "pycore_runtime.h" // _Py_SINGLETON() /* * Default int base conversion size limitation: Denial of Service prevention. diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h index 931d9a2..08cbfe4 100644 --- a/Include/internal/pycore_object.h +++ b/Include/internal/pycore_object.h @@ -13,6 +13,7 @@ extern "C" { #include "pycore_object_deferred.h" // _PyObject_HasDeferredRefcount #include "pycore_pyatomic_ft_wrappers.h" // FT_ATOMIC_STORE_PTR_RELAXED #include "pycore_pystate.h" // _PyInterpreterState_GET() +#include "pycore_runtime.h" // _PyRuntime #include "pycore_typeobject.h" // _PyStaticType_GetState() #include "pycore_uniqueid.h" // _PyObject_ThreadIncrefSlow() diff --git a/Include/internal/pycore_pylifecycle.h b/Include/internal/pycore_pylifecycle.h index 53ffe7f..6e89ca3 100644 --- a/Include/internal/pycore_pylifecycle.h +++ b/Include/internal/pycore_pylifecycle.h @@ -8,7 +8,7 @@ extern "C" { # error "this header requires Py_BUILD_CORE define" #endif -#include "pycore_runtime.h" // _PyRuntimeState +#include "pycore_typedefs.h" // _PyRuntimeState /* Forward declarations */ struct _PyArgv; diff --git a/Include/internal/pycore_unicodeobject.h b/Include/internal/pycore_unicodeobject.h index 34600ee..5fea324 100644 --- a/Include/internal/pycore_unicodeobject.h +++ b/Include/internal/pycore_unicodeobject.h @@ -10,7 +10,6 @@ extern "C" { #include "pycore_fileutils.h" // _Py_error_handler #include "pycore_ucnhash.h" // _PyUnicode_Name_CAPI -#include "pycore_global_objects.h" // _Py_SINGLETON /* --- Characters Type APIs ----------------------------------------------- */ -- cgit v0.12