summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2009-04-02 03:34:53 (GMT)
committerBrett Cannon <bcannon@gmail.com>2009-04-02 03:34:53 (GMT)
commit238cedcd6339e747daa6e2a383678d893482ef6d (patch)
treeb4cba8913e16ce8faff300cc797a5420aa2ee0f8
parent345b2fe21e7c18a7fd5cac4685e3daaf463a6b38 (diff)
downloadcpython-238cedcd6339e747daa6e2a383678d893482ef6d.zip
cpython-238cedcd6339e747daa6e2a383678d893482ef6d.tar.gz
cpython-238cedcd6339e747daa6e2a383678d893482ef6d.tar.bz2
Fix two issues introduced by issue #71031 by changing the signature of
PyImport_AppendInittab() to take a const char *.
-rw-r--r--Include/import.h2
-rw-r--r--Python/import.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Include/import.h b/Include/import.h
index 05ad7f0..a6e285739 100644
--- a/Include/import.h
+++ b/Include/import.h
@@ -43,7 +43,7 @@ struct _inittab {
PyAPI_DATA(PyTypeObject) PyNullImporter_Type;
PyAPI_DATA(struct _inittab *) PyImport_Inittab;
-PyAPI_FUNC(int) PyImport_AppendInittab(char *name, void (*initfunc)(void));
+PyAPI_FUNC(int) PyImport_AppendInittab(const char *name, void (*initfunc)(void));
PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab);
struct _frozen {
diff --git a/Python/import.c b/Python/import.c
index b39cb18..5e42e5c 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -3382,7 +3382,7 @@ PyImport_AppendInittab(const char *name, void (*initfunc)(void))
memset(newtab, '\0', sizeof newtab);
- newtab[0].name = name;
+ newtab[0].name = (char *)name;
newtab[0].initfunc = initfunc;
return PyImport_ExtendInittab(newtab);