bpo-39355: making Python.h compatible with C++20 compilers

Include/cpython/import.h

@@ -7,8 +7,8 @@ PyMODINIT_FUNC PyInit__imp(void);
 PyAPI_FUNC(int) _PyImport_IsInitialized(PyInterpreterState *);
 
 PyAPI_FUNC(PyObject *) _PyImport_GetModuleId(struct _Py_Identifier *name);
-PyAPI_FUNC(int) _PyImport_SetModule(PyObject *name, PyObject *module);
-PyAPI_FUNC(int) _PyImport_SetModuleString(const char *name, PyObject* module);
+PyAPI_FUNC(int) _PyImport_SetModule(PyObject *name, PyObject *mod);
+PyAPI_FUNC(int) _PyImport_SetModuleString(const char *name, PyObject *mod);
 
 PyAPI_FUNC(void) _PyImport_AcquireLock(void);
 PyAPI_FUNC(int) _PyImport_ReleaseLock(void);

Include/cpython/warnings.h

@@ -7,13 +7,13 @@ PyAPI_FUNC(int) PyErr_WarnExplicitObject(
     PyObject *message,
     PyObject *filename,
     int lineno,
-    PyObject *module,
+    PyObject *mod,
     PyObject *registry);
 
 PyAPI_FUNC(int) PyErr_WarnExplicitFormat(
     PyObject *category,
     const char *filename, int lineno,
-    const char *module, PyObject *registry,
+    const char *mod, PyObject *registry,
     const char *format, ...);
 
 // DEPRECATED: Use PyErr_WarnEx() instead.

Include/modsupport.h

@@ -158,7 +158,7 @@ PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long);
 PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *);
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000
 /* New in 3.9 */
-PyAPI_FUNC(int) PyModule_AddType(PyObject *module, PyTypeObject *type);
+PyAPI_FUNC(int) PyModule_AddType(PyObject *mod, PyTypeObject *type);
 #endif /* Py_LIMITED_API */
 #define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c)
 #define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c)
@@ -167,7 +167,7 @@ PyAPI_FUNC(int) PyModule_AddType(PyObject *module, PyTypeObject *type);
 /* New in 3.5 */
 PyAPI_FUNC(int) PyModule_SetDocString(PyObject *, const char *);
 PyAPI_FUNC(int) PyModule_AddFunctions(PyObject *, PyMethodDef *);
-PyAPI_FUNC(int) PyModule_ExecDef(PyObject *module, PyModuleDef *def);
+PyAPI_FUNC(int) PyModule_ExecDef(PyObject *mod, PyModuleDef *def);
 #endif
 
 #define Py_CLEANUP_SUPPORTED 0x20000

Include/warnings.h

@@ -29,7 +29,7 @@ PyAPI_FUNC(int) PyErr_WarnExplicit(
     const char *message,        /* UTF-8 encoded string */
     const char *filename,       /* decoded from the filesystem encoding */
     int lineno,
-    const char *module,         /* UTF-8 encoded string */
+    const char *mod,         /* UTF-8 encoded string */
     PyObject *registry);
 
 #ifndef Py_LIMITED_API

Misc/NEWS.d/next/Core and Builtins/2022-02-11-18-51-11.bpo-39355.rcUPdT.rst

@@ -0,0 +1 @@
+Make Python.h compatible with C++20 compilers