python · vstinner · Sep 29, 2021 · Sep 29, 2021
diff --git a/Include/Python.h b/Include/Python.h
@@ -76,7 +76,7 @@
 #include "typeslots.h"
 #include "pyhash.h"
 
-#include "cpython/pydebug.h"
+#include "cpython/cpython_pydebug.h"
 
 #include "bytearrayobject.h"
 #include "bytesobject.h"
@@ -91,7 +91,7 @@
 #include "tupleobject.h"
 #include "listobject.h"
 #include "dictobject.h"
-#include "cpython/odictobject.h"
+#include "cpython/cpython_odictobject.h"
 #include "enumobject.h"
 #include "setobject.h"
 #include "methodobject.h"
@@ -113,13 +113,13 @@
 #include "weakrefobject.h"
 #include "structseq.h"
 #include "namespaceobject.h"
-#include "cpython/picklebufobject.h"
-#include "cpython/pytime.h"
+#include "cpython/cpython_picklebufobject.h"
+#include "cpython/cpython_pytime.h"
 
 #include "codecs.h"
 #include "pyerrors.h"
 
-#include "cpython/initconfig.h"
+#include "cpython/cpython_initconfig.h"
 #include "pythread.h"
 #include "pystate.h"
 #include "context.h"
@@ -139,11 +139,11 @@
 
 #include "eval.h"
 
-#include "cpython/pyctype.h"
+#include "cpython/cpython_pyctype.h"
 #include "pystrtod.h"
 #include "pystrcmp.h"
 #include "fileutils.h"
-#include "cpython/pyfpe.h"
+#include "cpython/cpython_pyfpe.h"
 #include "tracemalloc.h"
 
 #endif /* !Py_PYTHON_H */
diff --git a/Include/abstract.h b/Include/abstract.h
@@ -863,7 +863,7 @@ PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_ABSTRACTOBJECT_H
-#  include  "cpython/abstract.h"
+#  include "cpython/cpython_abstract.h"
 #  undef Py_CPYTHON_ABSTRACTOBJECT_H
 #endif
 

diff --git a/Include/bytearrayobject.h b/Include/bytearrayobject.h
@@ -36,7 +36,7 @@ PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_BYTEARRAYOBJECT_H
-#  include  "cpython/bytearrayobject.h"
+#  include "cpython/cpython_bytearrayobject.h"
 #  undef Py_CPYTHON_BYTEARRAYOBJECT_H
 #endif
 

diff --git a/Include/bytesobject.h b/Include/bytesobject.h
@@ -59,7 +59,7 @@ PyAPI_FUNC(int) PyBytes_AsStringAndSize(
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_BYTESOBJECT_H
-#  include  "cpython/bytesobject.h"
+#  include "cpython/cpython_bytesobject.h"
 #  undef Py_CPYTHON_BYTESOBJECT_H
 #endif
 

diff --git a/Include/ceval.h b/Include/ceval.h
@@ -148,7 +148,7 @@ PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_CEVAL_H
-#  include  "cpython/ceval.h"
+#  include "cpython/cpython_ceval.h"
 #  undef Py_CPYTHON_CEVAL_H
 #endif
 

diff --git a/Include/code.h b/Include/code.h
@@ -10,7 +10,7 @@ typedef struct PyCodeObject PyCodeObject;
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_CODE_H
-#  include  "cpython/code.h"
+#  include "cpython/cpython_code.h"
 #  undef Py_CPYTHON_CODE_H
 #endif
 

diff --git a/Include/compile.h b/Include/compile.h
@@ -15,7 +15,7 @@ extern "C" {
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_COMPILE_H
-#  include "cpython/compile.h"
+#  include "cpython/cpython_compile.h"
 #  undef Py_CPYTHON_COMPILE_H
 #endif
 

diff --git a/Include/cpython/abstract.h → Include/cpython/cpython_abstract.h b/Include/cpython/abstract.h → Include/cpython/cpython_abstract.h
diff --git a/Include/cpython/bytearrayobject.h → Include/cpython/cpython_bytearrayobject.h b/Include/cpython/bytearrayobject.h → Include/cpython/cpython_bytearrayobject.h
diff --git a/Include/cpython/bytesobject.h → Include/cpython/cpython_bytesobject.h b/Include/cpython/bytesobject.h → Include/cpython/cpython_bytesobject.h
diff --git a/Include/cpython/ceval.h → Include/cpython/cpython_ceval.h b/Include/cpython/ceval.h → Include/cpython/cpython_ceval.h
diff --git a/Include/cpython/code.h → Include/cpython/cpython_code.h b/Include/cpython/code.h → Include/cpython/cpython_code.h
diff --git a/Include/cpython/compile.h → Include/cpython/cpython_compile.h b/Include/cpython/compile.h → Include/cpython/cpython_compile.h
diff --git a/Include/cpython/dictobject.h → Include/cpython/cpython_dictobject.h b/Include/cpython/dictobject.h → Include/cpython/cpython_dictobject.h
diff --git a/Include/cpython/fileobject.h → Include/cpython/cpython_fileobject.h b/Include/cpython/fileobject.h → Include/cpython/cpython_fileobject.h
diff --git a/Include/cpython/fileutils.h → Include/cpython/cpython_fileutils.h b/Include/cpython/fileutils.h → Include/cpython/cpython_fileutils.h
diff --git a/Include/cpython/frameobject.h → Include/cpython/cpython_frameobject.h b/Include/cpython/frameobject.h → Include/cpython/cpython_frameobject.h
diff --git a/Include/cpython/listobject.h → Include/cpython/cpython_listobject.h b/Include/cpython/listobject.h → Include/cpython/cpython_listobject.h
diff --git a/Include/cpython/methodobject.h → Include/cpython/cpython_methodobject.h b/Include/cpython/methodobject.h → Include/cpython/cpython_methodobject.h
diff --git a/Include/cpython/object.h → Include/cpython/cpython_object.h b/Include/cpython/object.h → Include/cpython/cpython_object.h
diff --git a/Include/cpython/objimpl.h → Include/cpython/cpython_objimpl.h b/Include/cpython/objimpl.h → Include/cpython/cpython_objimpl.h
diff --git a/Include/cpython/odictobject.h → Include/cpython/cpython_odictobject.h b/Include/cpython/odictobject.h → Include/cpython/cpython_odictobject.h
diff --git a/Include/cpython/picklebufobject.h → Include/cpython/cpython_picklebufobject.h b/Include/cpython/picklebufobject.h → Include/cpython/cpython_picklebufobject.h
diff --git a/Include/cpython/pyctype.h → Include/cpython/cpython_pyctype.h b/Include/cpython/pyctype.h → Include/cpython/cpython_pyctype.h
diff --git a/Include/cpython/pydebug.h → Include/cpython/cpython_pydebug.h b/Include/cpython/pydebug.h → Include/cpython/cpython_pydebug.h
diff --git a/Include/cpython/pyerrors.h → Include/cpython/cpython_pyerrors.h b/Include/cpython/pyerrors.h → Include/cpython/cpython_pyerrors.h
diff --git a/Include/cpython/pyfpe.h → Include/cpython/cpython_pyfpe.h b/Include/cpython/pyfpe.h → Include/cpython/cpython_pyfpe.h
diff --git a/Include/cpython/pymem.h → Include/cpython/cpython_pymem.h b/Include/cpython/pymem.h → Include/cpython/cpython_pymem.h
@@ -2,7 +2,7 @@
 #  error "this header file must not be included directly"
 #endif
 
-#include "cpython/initconfig.h"
+#include "cpython_initconfig.h"
 
 PyAPI_FUNC(int) _PyInterpreterState_RequiresIDRef(PyInterpreterState *);
 PyAPI_FUNC(void) _PyInterpreterState_RequireIDRef(PyInterpreterState *, int);

diff --git a/Include/cpython/pytime.h → Include/cpython/cpython_pytime.h b/Include/cpython/pytime.h → Include/cpython/cpython_pytime.h
diff --git a/Include/cpython/traceback.h → Include/cpython/cpython_traceback.h b/Include/cpython/traceback.h → Include/cpython/cpython_traceback.h
diff --git a/Include/cpython/tupleobject.h → Include/cpython/cpython_tupleobject.h b/Include/cpython/tupleobject.h → Include/cpython/cpython_tupleobject.h
diff --git a/Include/cpython/unicodeobject.h → Include/cpython/cpython_unicodeobject.h b/Include/cpython/unicodeobject.h → Include/cpython/cpython_unicodeobject.h
diff --git a/Include/dictobject.h b/Include/dictobject.h
@@ -87,7 +87,7 @@ PyAPI_DATA(PyTypeObject) PyDictRevIterValue_Type;
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_DICTOBJECT_H
-#  include  "cpython/dictobject.h"
+#  include "cpython/cpython_dictobject.h"
 #  undef Py_CPYTHON_DICTOBJECT_H
 #endif
 

diff --git a/Include/fileobject.h b/Include/fileobject.h
@@ -39,7 +39,7 @@ PyAPI_DATA(int) Py_UTF8Mode;
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_FILEOBJECT_H
-#  include  "cpython/fileobject.h"
+#  include "cpython/cpython_fileobject.h"
 #  undef Py_CPYTHON_FILEOBJECT_H
 #endif
 

diff --git a/Include/fileutils.h b/Include/fileutils.h
@@ -16,7 +16,7 @@ PyAPI_FUNC(char*) Py_EncodeLocale(
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_FILEUTILS_H
-#  include  "cpython/fileutils.h"
+#  include "cpython/cpython_fileutils.h"
 #  undef Py_CPYTHON_FILEUTILS_H
 #endif
 

diff --git a/Include/frameobject.h b/Include/frameobject.h
@@ -10,7 +10,7 @@ extern "C" {
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_FRAMEOBJECT_H
-#  include  "cpython/frameobject.h"
+#  include "cpython/cpython_frameobject.h"
 #  undef Py_CPYTHON_FRAMEOBJECT_H
 #endif
 

@@ -88,7 +88,7 @@ PyAPI_FUNC(int) PyImport_AppendInittab(
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_IMPORT_H
-#  include  "cpython/import.h"
+#  include "cpython/cpython_import.h"
 #  undef Py_CPYTHON_IMPORT_H
 #endif
 

@@ -7,7 +7,7 @@ extern "C" {
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_INTERPRETERIDOBJECT_H
-#  include  "cpython/interpreteridobject.h"
+#  include "cpython/cpython_interpreteridobject.h"
 #  undef Py_CPYTHON_INTERPRETERIDOBJECT_H
 #endif
 

diff --git a/Include/listobject.h b/Include/listobject.h
@@ -42,7 +42,7 @@ PyAPI_FUNC(PyObject *) PyList_AsTuple(PyObject *);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_LISTOBJECT_H
-#  include  "cpython/listobject.h"
+#  include "cpython/cpython_listobject.h"
 #  undef Py_CPYTHON_LISTOBJECT_H
 #endif
 

diff --git a/Include/methodobject.h b/Include/methodobject.h
@@ -105,7 +105,7 @@ PyAPI_FUNC(PyObject *) PyCMethod_New(PyMethodDef *, PyObject *,
 #ifndef Py_LIMITED_API
 
 #define Py_CPYTHON_METHODOBJECT_H
-#include  "cpython/methodobject.h"
+#include "cpython/cpython_methodobject.h"
 #undef Py_CPYTHON_METHODOBJECT_H
 
 #endif

diff --git a/Include/object.h b/Include/object.h
@@ -723,7 +723,7 @@ times.
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_OBJECT_H
-#  include  "cpython/object.h"
+#  include "cpython/cpython_object.h"
 #  undef Py_CPYTHON_OBJECT_H
 #endif
 

diff --git a/Include/objimpl.h b/Include/objimpl.h
@@ -205,7 +205,7 @@ PyAPI_FUNC(int) PyObject_GC_IsFinalized(PyObject *);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_OBJIMPL_H
-#  include  "cpython/objimpl.h"
+#  include "cpython/cpython_objimpl.h"
 #  undef Py_CPYTHON_OBJIMPL_H
 #endif
 

diff --git a/Include/pyerrors.h b/Include/pyerrors.h
@@ -314,7 +314,7 @@ PyAPI_FUNC(int) PyOS_vsnprintf(char *str, size_t size, const char  *format, va_l
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_ERRORS_H
-#  include  "cpython/pyerrors.h"
+#  include "cpython/cpython_pyerrors.h"
 #  undef Py_CPYTHON_ERRORS_H
 #endif
 

@@ -64,7 +64,7 @@ PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_PYLIFECYCLE_H
-#  include  "cpython/pylifecycle.h"
+#  include "cpython/cpython_pylifecycle.h"
 #  undef Py_CPYTHON_PYLIFECYCLE_H
 #endif
 

diff --git a/Include/pymem.h b/Include/pymem.h
@@ -93,7 +93,7 @@ PyAPI_FUNC(void) PyMem_Free(void *ptr);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_PYMEM_H
-#  include  "cpython/pymem.h"
+#  include "cpython/cpython_pymem.h"
 #  undef Py_CPYTHON_PYMEM_H
 #endif
 

@@ -140,7 +140,7 @@ PyAPI_FUNC(PyThreadState *) PyGILState_GetThisThreadState(void);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_PYSTATE_H
-#  include  "cpython/pystate.h"
+#  include "cpython/cpython_pystate.h"
 #  undef Py_CPYTHON_PYSTATE_H
 #endif
 

@@ -34,7 +34,7 @@ PyAPI_FUNC(int) PyOS_CheckStack(void);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_PYTHONRUN_H
-#  include  "cpython/pythonrun.h"
+#  include "cpython/cpython_pythonrun.h"
 #  undef Py_CPYTHON_PYTHONRUN_H
 #endif
 

@@ -31,7 +31,7 @@ PyAPI_FUNC(PyObject *) PySys_GetXOptions(void);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_SYSMODULE_H
-#  include  "cpython/sysmodule.h"
+#  include "cpython/cpython_sysmodule.h"
 #  undef Py_CPYTHON_SYSMODULE_H
 #endif
 

diff --git a/Include/traceback.h b/Include/traceback.h
@@ -16,7 +16,7 @@ PyAPI_DATA(PyTypeObject) PyTraceBack_Type;
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_TRACEBACK_H
-#  include  "cpython/traceback.h"
+#  include "cpython/cpython_traceback.h"
 #  undef Py_CPYTHON_TRACEBACK_H
 #endif
 

diff --git a/Include/tupleobject.h b/Include/tupleobject.h
@@ -36,7 +36,7 @@ PyAPI_FUNC(PyObject *) PyTuple_Pack(Py_ssize_t, ...);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_TUPLEOBJECT_H
-#  include  "cpython/tupleobject.h"
+#  include "cpython/cpython_tupleobject.h"
 #  undef Py_CPYTHON_TUPLEOBJECT_H
 #endif
 

diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
@@ -1043,7 +1043,7 @@ PyAPI_FUNC(int) PyUnicode_IsIdentifier(PyObject *s);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_UNICODEOBJECT_H
-#  include  "cpython/unicodeobject.h"
+#  include "cpython/cpython_unicodeobject.h"
 #  undef Py_CPYTHON_UNICODEOBJECT_H
 #endif
 

diff --git a/Lib/__future__.py b/Lib/__future__.py
@@ -42,7 +42,7 @@
 argument to the builtin function compile() to enable the feature in
 dynamically compiled code.  This flag is stored in the .compiler_flag
 attribute on _Future instances.  These values must match the appropriate
-#defines of CO_xxx flags in Include/cpython/compile.h.
+#defines of CO_xxx flags in Include/cpython/cpython_compile.h.
 
 No feature line is ever to be deleted from this file.
 """

@@ -1175,38 +1175,38 @@ PYTHON_HEADERS= \
 		pyconfig.h \
 		$(PARSER_HEADERS) \
 		\
-		$(srcdir)/Include/cpython/abstract.h \
-		$(srcdir)/Include/cpython/bytearrayobject.h \
-		$(srcdir)/Include/cpython/bytesobject.h \
-		$(srcdir)/Include/cpython/ceval.h \
-		$(srcdir)/Include/cpython/code.h \
-		$(srcdir)/Include/cpython/compile.h \
-		$(srcdir)/Include/cpython/dictobject.h \
-		$(srcdir)/Include/cpython/fileobject.h \
-		$(srcdir)/Include/cpython/fileutils.h \
-		$(srcdir)/Include/cpython/frameobject.h \
-		$(srcdir)/Include/cpython/import.h \
-		$(srcdir)/Include/cpython/initconfig.h \
-		$(srcdir)/Include/cpython/interpreteridobject.h \
-		$(srcdir)/Include/cpython/listobject.h \
-		$(srcdir)/Include/cpython/methodobject.h \
-		$(srcdir)/Include/cpython/object.h \
-		$(srcdir)/Include/cpython/objimpl.h \
-		$(srcdir)/Include/cpython/odictobject.h \
-		$(srcdir)/Include/cpython/picklebufobject.h \
-		$(srcdir)/Include/cpython/pyctype.h \
-		$(srcdir)/Include/cpython/pydebug.h \
-		$(srcdir)/Include/cpython/pyerrors.h \
-		$(srcdir)/Include/cpython/pyfpe.h \
-		$(srcdir)/Include/cpython/pylifecycle.h \
-		$(srcdir)/Include/cpython/pymem.h \
-		$(srcdir)/Include/cpython/pystate.h \
-		$(srcdir)/Include/cpython/pythonrun.h \
-		$(srcdir)/Include/cpython/pytime.h \
-		$(srcdir)/Include/cpython/sysmodule.h \
-		$(srcdir)/Include/cpython/traceback.h \
-		$(srcdir)/Include/cpython/tupleobject.h \
-		$(srcdir)/Include/cpython/unicodeobject.h \
+		$(srcdir)/Include/cpython/cpython_abstract.h \
+		$(srcdir)/Include/cpython/cpython_bytearrayobject.h \
+		$(srcdir)/Include/cpython/cpython_bytesobject.h \
+		$(srcdir)/Include/cpython/cpython_ceval.h \
+		$(srcdir)/Include/cpython/cpython_code.h \
+		$(srcdir)/Include/cpython/cpython_compile.h \
+		$(srcdir)/Include/cpython/cpython_dictobject.h \
+		$(srcdir)/Include/cpython/cpython_fileobject.h \
+		$(srcdir)/Include/cpython/cpython_fileutils.h \
+		$(srcdir)/Include/cpython/cpython_frameobject.h \
+		$(srcdir)/Include/cpython/cpython_import.h \
+		$(srcdir)/Include/cpython/cpython_initconfig.h \
+		$(srcdir)/Include/cpython/cpython_interpreteridobject.h \
+		$(srcdir)/Include/cpython/cpython_listobject.h \
+		$(srcdir)/Include/cpython/cpython_methodobject.h \
+		$(srcdir)/Include/cpython/cpython_object.h \
+		$(srcdir)/Include/cpython/cpython_objimpl.h \
+		$(srcdir)/Include/cpython/cpython_odictobject.h \
+		$(srcdir)/Include/cpython/cpython_picklebufobject.h \
+		$(srcdir)/Include/cpython/cpython_pyctype.h \
+		$(srcdir)/Include/cpython/cpython_pydebug.h \
+		$(srcdir)/Include/cpython/cpython_pyerrors.h \
+		$(srcdir)/Include/cpython/cpython_pyfpe.h \
+		$(srcdir)/Include/cpython/cpython_pylifecycle.h \
+		$(srcdir)/Include/cpython/cpython_pymem.h \
+		$(srcdir)/Include/cpython/cpython_pystate.h \
+		$(srcdir)/Include/cpython/cpython_pythonrun.h \
+		$(srcdir)/Include/cpython/cpython_pytime.h \
+		$(srcdir)/Include/cpython/cpython_sysmodule.h \
+		$(srcdir)/Include/cpython/cpython_traceback.h \
+		$(srcdir)/Include/cpython/cpython_tupleobject.h \
+		$(srcdir)/Include/cpython/cpython_unicodeobject.h \
 		\
 		$(srcdir)/Include/internal/pycore_abstract.h \
 		$(srcdir)/Include/internal/pycore_accu.h \

diff --git a/Misc/NEWS.d/next/Build/2021-09-29-11-26-18.bpo-39026.p01JoG.rst b/Misc/NEWS.d/next/Build/2021-09-29-11-26-18.bpo-39026.p01JoG.rst
@@ -0,0 +1,4 @@
+Fix building Python on macOS Framework: fix include from
+Include/cpython/pystate.h to Include/cpython/initconfig.h. Header files of
+the Include/cpython/ subdirectory now get a ``cpython_`` prefix in their
+filename to avoid confusion.
diff --git a/Misc/NEWS.d/next/C API/2021-09-29-11-24-32.bpo-39026.ttj5A1.rst b/Misc/NEWS.d/next/C API/2021-09-29-11-24-32.bpo-39026.ttj5A1.rst
@@ -0,0 +1,6 @@
+Header files of the ``Include/cpython/`` subdirectory now get a ``cpython_``
+prefix in their filename to avoid confusion between ``Include/<header>.h``
+and ``Include/cpython/<header.h>`` (previously both files had the same
+name), especially when a cpython header file includes another cpython header
+file. Headers of the ``Include/cpython/`` subdirectory cannot be included
+directly, so this change has no impact on the C API.