Skip to content

Commit 31708f4

Browse files
committed
bpo-39355: making Python.h compatible with C++20 compilers
Renamed module to mod in header files
1 parent 4a66615 commit 31708f4

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Include/cpython/import.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ PyMODINIT_FUNC PyInit__imp(void);
77
PyAPI_FUNC(int) _PyImport_IsInitialized(PyInterpreterState *);
88

99
PyAPI_FUNC(PyObject *) _PyImport_GetModuleId(struct _Py_Identifier *name);
10-
PyAPI_FUNC(int) _PyImport_SetModule(PyObject *name, PyObject *module);
11-
PyAPI_FUNC(int) _PyImport_SetModuleString(const char *name, PyObject* module);
10+
PyAPI_FUNC(int) _PyImport_SetModule(PyObject *name, PyObject *mod);
11+
PyAPI_FUNC(int) _PyImport_SetModuleString(const char *name, PyObject *mod);
1212

1313
PyAPI_FUNC(void) _PyImport_AcquireLock(void);
1414
PyAPI_FUNC(int) _PyImport_ReleaseLock(void);

Include/cpython/warnings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ PyAPI_FUNC(int) PyErr_WarnExplicitObject(
77
PyObject *message,
88
PyObject *filename,
99
int lineno,
10-
PyObject *module,
10+
PyObject *mod,
1111
PyObject *registry);
1212

1313
PyAPI_FUNC(int) PyErr_WarnExplicitFormat(
1414
PyObject *category,
1515
const char *filename, int lineno,
16-
const char *module, PyObject *registry,
16+
const char *mod, PyObject *registry,
1717
const char *format, ...);
1818

1919
// DEPRECATED: Use PyErr_WarnEx() instead.

Include/modsupport.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long);
158158
PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *);
159159
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000
160160
/* New in 3.9 */
161-
PyAPI_FUNC(int) PyModule_AddType(PyObject *module, PyTypeObject *type);
161+
PyAPI_FUNC(int) PyModule_AddType(PyObject *mod, PyTypeObject *type);
162162
#endif /* Py_LIMITED_API */
163163
#define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c)
164164
#define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c)
@@ -167,7 +167,7 @@ PyAPI_FUNC(int) PyModule_AddType(PyObject *module, PyTypeObject *type);
167167
/* New in 3.5 */
168168
PyAPI_FUNC(int) PyModule_SetDocString(PyObject *, const char *);
169169
PyAPI_FUNC(int) PyModule_AddFunctions(PyObject *, PyMethodDef *);
170-
PyAPI_FUNC(int) PyModule_ExecDef(PyObject *module, PyModuleDef *def);
170+
PyAPI_FUNC(int) PyModule_ExecDef(PyObject *mod, PyModuleDef *def);
171171
#endif
172172

173173
#define Py_CLEANUP_SUPPORTED 0x20000

Include/warnings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ PyAPI_FUNC(int) PyErr_WarnExplicit(
2929
const char *message, /* UTF-8 encoded string */
3030
const char *filename, /* decoded from the filesystem encoding */
3131
int lineno,
32-
const char *module, /* UTF-8 encoded string */
32+
const char *mod, /* UTF-8 encoded string */
3333
PyObject *registry);
3434

3535
#ifndef Py_LIMITED_API

0 commit comments

Comments
 (0)