aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Modules/_functoolsmodule.c1
-rw-r--r--Modules/gcmodule.c1
-rw-r--r--Modules/main.c1
-rw-r--r--Objects/bytearrayobject.c1
-rw-r--r--Objects/bytesobject.c4
-rw-r--r--Objects/cellobject.c1
-rw-r--r--Objects/classobject.c1
-rw-r--r--Objects/exceptions.c1
-rw-r--r--Objects/funcobject.c1
-rw-r--r--Objects/iterobject.c1
-rw-r--r--Objects/memoryobject.c1
-rw-r--r--Objects/methodobject.c1
-rw-r--r--Objects/obmalloc.c2
-rw-r--r--Objects/sliceobject.c1
-rw-r--r--Python/import.c2
-rw-r--r--Python/initconfig.c2
-rw-r--r--Python/pathconfig.c2
-rw-r--r--Python/preconfig.c6
-rw-r--r--Python/pylifecycle.c1
-rw-r--r--Python/pystate.c2
-rw-r--r--Python/sysmodule.c6
21 files changed, 13 insertions, 26 deletions
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
index 90e388c1c63..78706b6ec3c 100644
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -1,5 +1,4 @@
#include "Python.h"
-#include "pycore_pymem.h"
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_tupleobject.h"
#include "structmember.h" // PyMemberDef
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index d2cd2c92966..5727820f09b 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -30,7 +30,6 @@
#include "pycore_object.h"
#include "pycore_pyerrors.h"
#include "pycore_pystate.h" // _PyThreadState_GET()
-#include "pycore_pymem.h"
#include "frameobject.h" // PyFrame_ClearFreeList
#include "pydtrace.h"
#include "pytime.h" // _PyTime_GetMonotonicClock()
diff --git a/Modules/main.c b/Modules/main.c
index fa9c6b4eb94..4d696a35901 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -5,7 +5,6 @@
#include "pycore_interp.h" // _PyInterpreterState.sysdict
#include "pycore_pathconfig.h"
#include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
#include "pycore_pystate.h" // _PyInterpreterState_GET()
/* Includes for exit_sigint() */
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index f05a98acba0..b271e57abb6 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -5,7 +5,6 @@
#include "pycore_abstract.h" // _PyIndex_Check()
#include "pycore_bytes_methods.h"
#include "pycore_object.h"
-#include "pycore_pymem.h"
#include "bytesobject.h"
#include "pystrhex.h"
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 30bc739ceea..06ead2b58f9 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -3,10 +3,10 @@
#define PY_SSIZE_T_CLEAN
#include "Python.h"
-#include "pycore_abstract.h" // _PyIndex_Check()
+#include "pycore_abstract.h" // _PyIndex_Check()
#include "pycore_bytes_methods.h"
#include "pycore_object.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h" // PYMEM_CLEANBYTE
#include "pystrhex.h"
#include <stddef.h>
diff --git a/Objects/cellobject.c b/Objects/cellobject.c
index 6efae626bf5..86a89f02e60 100644
--- a/Objects/cellobject.c
+++ b/Objects/cellobject.c
@@ -2,7 +2,6 @@
#include "Python.h"
#include "pycore_object.h"
-#include "pycore_pymem.h"
PyObject *
PyCell_New(PyObject *obj)
diff --git a/Objects/classobject.c b/Objects/classobject.c
index 242a6428b8e..fd9f8757f84 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -3,7 +3,6 @@
#include "Python.h"
#include "pycore_object.h"
#include "pycore_pyerrors.h"
-#include "pycore_pymem.h"
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "structmember.h" // PyMemberDef
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index db1ff329ac1..69a6b5c284d 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -8,7 +8,6 @@
#include <Python.h>
#include "pycore_initconfig.h"
#include "pycore_object.h"
-#include "pycore_pymem.h"
#include "structmember.h" // PyMemberDef
#include "osdefs.h"
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 750c7aea0df..bd24f67b974 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -3,7 +3,6 @@
#include "Python.h"
#include "pycore_object.h"
-#include "pycore_pymem.h"
#include "pycore_tupleobject.h"
#include "code.h"
#include "structmember.h" // PyMemberDef
diff --git a/Objects/iterobject.c b/Objects/iterobject.c
index 51104fbe969..6cac41ad539 100644
--- a/Objects/iterobject.c
+++ b/Objects/iterobject.c
@@ -2,7 +2,6 @@
#include "Python.h"
#include "pycore_object.h"
-#include "pycore_pymem.h"
typedef struct {
PyObject_HEAD
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index 4340f0675f1..682bbe8a61e 100644
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -13,7 +13,6 @@
#include "Python.h"
#include "pycore_abstract.h" // _PyIndex_Check()
#include "pycore_object.h"
-#include "pycore_pymem.h"
#include "pystrhex.h"
#include <stddef.h>
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index f4836713162..20eba6fa864 100644
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -5,7 +5,6 @@
#include "pycore_ceval.h" // _Py_EnterRecursiveCall()
#include "pycore_object.h"
#include "pycore_pyerrors.h"
-#include "pycore_pymem.h"
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "structmember.h" // PyMemberDef
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 3f6f9cf9ca4..eb34f10bddf 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1,5 +1,5 @@
#include "Python.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h" // _PyTraceMalloc_Config
#include <stdbool.h>
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index 6093b3bd153..391711f711a 100644
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -16,7 +16,6 @@ this type and there is exactly one in existence.
#include "Python.h"
#include "pycore_abstract.h" // _PyIndex_Check()
#include "pycore_object.h"
-#include "pycore_pymem.h"
#include "structmember.h" // PyMemberDef
static PyObject *
diff --git a/Python/import.c b/Python/import.c
index 2f2e9d17061..a2aa4afa18a 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -8,7 +8,7 @@
#include "pycore_pyerrors.h"
#include "pycore_pyhash.h"
#include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h" // _PyMem_SetDefaultAllocator()
#include "pycore_interp.h" // _PyInterpreterState_ClearModules()
#include "pycore_pystate.h" // _PyInterpreterState_GET()
#include "pycore_sysmodule.h"
diff --git a/Python/initconfig.c b/Python/initconfig.c
index 201d930f7d8..32aafdb57ad 100644
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -7,7 +7,7 @@
#include "pycore_pathconfig.h"
#include "pycore_pyerrors.h"
#include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h" // _PyMem_SetDefaultAllocator()
#include "pycore_pystate.h" // _PyThreadState_GET()
#include <locale.h> // setlocale()
#ifdef HAVE_LANGINFO_H
diff --git a/Python/pathconfig.c b/Python/pathconfig.c
index 1515926531a..6ebfdac3fd2 100644
--- a/Python/pathconfig.c
+++ b/Python/pathconfig.c
@@ -5,7 +5,7 @@
#include "pycore_initconfig.h"
#include "pycore_fileutils.h"
#include "pycore_pathconfig.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h" // _PyMem_SetDefaultAllocator()
#include <wchar.h>
#ifdef MS_WINDOWS
# include <windows.h> // GetFullPathNameW(), MAX_PATH
diff --git a/Python/preconfig.c b/Python/preconfig.c
index 531d8d0df35..1cbfccfe69c 100644
--- a/Python/preconfig.c
+++ b/Python/preconfig.c
@@ -1,9 +1,9 @@
#include "Python.h"
#include "pycore_getopt.h"
#include "pycore_initconfig.h"
-#include "pycore_pymem.h" // _PyMem_GetAllocatorName()
-#include "pycore_runtime.h" // _PyRuntime_Initialize()
-#include <locale.h> // setlocale()
+#include "pycore_pymem.h" // _PyMem_GetAllocatorName()
+#include "pycore_runtime.h" // _PyRuntime_Initialize()
+#include <locale.h> // setlocale()
#define DECODE_LOCALE_ERR(NAME, LEN) \
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 974b425712c..9c13274dac0 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -14,7 +14,6 @@
#include "pycore_pathconfig.h"
#include "pycore_pyerrors.h"
#include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_sysmodule.h"
#include "pycore_traceback.h"
diff --git a/Python/pystate.c b/Python/pystate.c
index d25fb3a2a62..84a694b32e5 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -6,7 +6,7 @@
#include "pycore_initconfig.h"
#include "pycore_pyerrors.h"
#include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h" // _PyMem_SetDefaultAllocator()
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_sysmodule.h"
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 63111d58ab2..4e67325318a 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -17,14 +17,14 @@ Data members:
#include "Python.h"
#include "code.h"
#include "frameobject.h"
-#include "pycore_ceval.h" // _Py_RecursionLimitLowerWaterMark()
+#include "pycore_ceval.h" // _Py_RecursionLimitLowerWaterMark()
#include "pycore_initconfig.h"
#include "pycore_object.h"
#include "pycore_pathconfig.h"
#include "pycore_pyerrors.h"
#include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
-#include "pycore_pystate.h" // _PyThreadState_GET()
+#include "pycore_pymem.h" // _PyMem_SetDefaultAllocator()
+#include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_tupleobject.h"
#include "pydtrace.h"