[Python-checkins] python/dist/src/Modules zipimport.c,1.17,1.18

Wed Nov 10 14:08:39 CET 2004

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631
Modified Files:
	zipimport.c 
Log Message:
SF patch 1062495: Modules/zipimport.c does not compile on solaris
(Contributed by Niki W. Waibel.)
Simple renaming to avoid a conflict that prevented compilation on Solaris.
Index: zipimport.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/zipimport.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18

--- zipimport.c	7 Sep 2003 13:36:48 -0000	1.17
+++ zipimport.c	10 Nov 2004 13:08:35 -0000	1.18
@@ -250,7 +250,7 @@
 	return len;
 }
 
-enum module_info {
+enum zi_module_info {
 	MI_ERROR,
 	MI_NOT_FOUND,
 	MI_MODULE,
@@ -258,7 +258,7 @@
 };
 
 /* Return some information about a module. */
-static enum module_info
+static enum zi_module_info
 get_module_info(ZipImporter *self, char *fullname)
 {
 	char *subname, path[MAXPATHLEN + 1];
@@ -291,7 +291,7 @@
 	ZipImporter *self = (ZipImporter *)obj;
 	PyObject *path = NULL;
 	char *fullname;
-	enum module_info mi;
+	enum zi_module_info mi;
 
 	if (!PyArg_ParseTuple(args, "s|O:zipimporter.find_module",
 			 &fullname, &path))
@@ -379,7 +379,7 @@
 {
 	ZipImporter *self = (ZipImporter *)obj;
 	char *fullname;
-	enum module_info mi;
+	enum zi_module_info mi;
 
 	if (!PyArg_ParseTuple(args, "s:zipimporter.is_package",
 			 &fullname))
@@ -457,7 +457,7 @@
 	PyObject *toc_entry;
 	char *fullname, *subname, path[MAXPATHLEN+1];
 	int len;
-	enum module_info mi;
+	enum zi_module_info mi;
 
 	if (!PyArg_ParseTuple(args, "s:zipimporter.get_source", &fullname))
 		return NULL;
