Skip to content

Commit 621cebe

Browse files
vstinnervstinner
authored
bpo-35081: Rename internal headers (pythonGH-10275)
Rename Include/internal/ headers: * pycore_hash.h -> pycore_pyhash.h * pycore_lifecycle.h -> pycore_pylifecycle.h * pycore_mem.h -> pycore_pymem.h * pycore_state.h -> pycore_pystate.h Add missing headers to Makefile.pre.in and PCbuild: * pycore_condvar.h. * pycore_hamt.h * pycore_pyhash.h
1 parent 19c46a4 commit 621cebe

65 files changed

Lines changed: 102 additions & 95 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Include/internal/pycore_hash.h renamed to Include/internal/pycore_pyhash.h

File renamed without changes.

Include/internal/pycore_lifecycle.h renamed to Include/internal/pycore_pylifecycle.h

File renamed without changes.

Include/internal/pycore_mem.h renamed to Include/internal/pycore_pymem.h

File renamed without changes.

Include/internal/pycore_state.h renamed to Include/internal/pycore_pystate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ extern "C" {
1212
#include "pythread.h"
1313

1414
#include "pycore_ceval.h"
15-
#include "pycore_mem.h"
1615
#include "pycore_pathconfig.h"
16+
#include "pycore_pymem.h"
1717
#include "pycore_warnings.h"
1818

1919

‎Include/pystate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
301301
/* Get the current Python thread state.
302302
303303
Macro using PyThreadState_Get() or _PyThreadState_GET() depending if
304-
pycore_state.h is included or not (this header redefines the macro).
304+
pycore_pystate.h is included or not (this header redefines the macro).
305305
306306
If PyThreadState_Get() is used, issue a fatal error if the current thread
307307
state is NULL.

‎Makefile.pre.in‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,13 +1027,16 @@ PYTHON_HEADERS= \
10271027
$(srcdir)/Include/internal/pycore_accu.h \
10281028
$(srcdir)/Include/internal/pycore_atomic.h \
10291029
$(srcdir)/Include/internal/pycore_ceval.h \
1030+
$(srcdir)/Include/internal/pycore_condvar.h \
10301031
$(srcdir)/Include/internal/pycore_context.h \
10311032
$(srcdir)/Include/internal/pycore_getopt.h \
10321033
$(srcdir)/Include/internal/pycore_gil.h \
1033-
$(srcdir)/Include/internal/pycore_lifecycle.h \
1034-
$(srcdir)/Include/internal/pycore_mem.h \
1034+
$(srcdir)/Include/internal/pycore_hamt.h \
10351035
$(srcdir)/Include/internal/pycore_pathconfig.h \
1036-
$(srcdir)/Include/internal/pycore_state.h \
1036+
$(srcdir)/Include/internal/pycore_pyhash.h \
1037+
$(srcdir)/Include/internal/pycore_pylifecycle.h \
1038+
$(srcdir)/Include/internal/pycore_pymem.h \
1039+
$(srcdir)/Include/internal/pycore_pystate.h \
10371040
$(srcdir)/Include/internal/pycore_warnings.h \
10381041
$(DTRACE_HEADERS)
10391042

‎Modules/_functoolsmodule.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#include "Python.h"
3-
#include "pycore_mem.h"
4-
#include "pycore_state.h"
3+
#include "pycore_pymem.h"
4+
#include "pycore_pystate.h"
55
#include "structmember.h"
66

77
/* _functools module written and maintained

‎Modules/_io/bufferedio.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#define PY_SSIZE_T_CLEAN
1111
#include "Python.h"
12-
#include "pycore_state.h"
12+
#include "pycore_pystate.h"
1313
#include "structmember.h"
1414
#include "pythread.h"
1515
#include "_iomodule.h"

‎Modules/_threadmodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/* Interface to Sjoerd's portable C thread library */
44

55
#include "Python.h"
6-
#include "pycore_state.h"
6+
#include "pycore_pystate.h"
77
#include "structmember.h" /* offsetof */
88
#include "pythread.h"
99

‎Modules/_xxsubinterpretersmodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "Python.h"
66
#include "frameobject.h"
7-
#include "pycore_state.h"
7+
#include "pycore_pystate.h"
88

99

1010
static char *

0 commit comments

Comments
 (0)