[Python-checkins] r71033 - in python/trunk: Include/import.h Python/import.c

[brett.cannon]

Author: brett.cannon
Date: Thu Apr  2 05:34:53 2009
New Revision: 71033

Log:
Fix two issues introduced by issue #71031 by changing the signature of
PyImport_AppendInittab() to take a const char *.


Modified:
   python/trunk/Include/import.h
   python/trunk/Python/import.c

Modified: python/trunk/Include/import.h
==============================================================================
--- python/trunk/Include/import.h	(original)
+++ python/trunk/Include/import.h	Thu Apr  2 05:34:53 2009
@@ -43,7 +43,7 @@
 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 {

Modified: python/trunk/Python/import.c
==============================================================================
--- python/trunk/Python/import.c	(original)
+++ python/trunk/Python/import.c	Thu Apr  2 05:34:53 2009
@@ -3382,7 +3382,7 @@
 
 	memset(newtab, '\0', sizeof newtab);
 
-	newtab[0].name = name;
+	newtab[0].name = (char *)name;
 	newtab[0].initfunc = initfunc;
 
 	return PyImport_ExtendInittab(newtab);