traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Raymond Hettinger 2004-11-10 13:08:35 +00:00
parent 41f7038a3e
commit 2c45c9ae57
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/zipimport.c
View File

@ -250,7 +250,7 @@ make_filename(char *prefix, char *name, char *path)
return len; return len;
} }
enum module_info { enum zi_module_info {
MI_ERROR, MI_ERROR,
MI_NOT_FOUND, MI_NOT_FOUND,
MI_MODULE, MI_MODULE,
@ -258,7 +258,7 @@ enum module_info {
}; };
/* Return some information about a module. */ /* Return some information about a module. */
static enum module_info static enum zi_module_info
get_module_info(ZipImporter *self, char *fullname) get_module_info(ZipImporter *self, char *fullname)
{ {
char *subname, path[MAXPATHLEN + 1]; char *subname, path[MAXPATHLEN + 1];
@ -291,7 +291,7 @@ zipimporter_find_module(PyObject *obj, PyObject *args)
ZipImporter *self = (ZipImporter *)obj; ZipImporter *self = (ZipImporter *)obj;
PyObject *path = NULL; PyObject *path = NULL;
char *fullname; char *fullname;
enum module_info mi; enum zi_module_info mi;
if (!PyArg_ParseTuple(args, "s|O:zipimporter.find_module", if (!PyArg_ParseTuple(args, "s|O:zipimporter.find_module",
&fullname, &path)) &fullname, &path))
@ -379,7 +379,7 @@ zipimporter_is_package(PyObject *obj, PyObject *args)
{ {
ZipImporter *self = (ZipImporter *)obj; ZipImporter *self = (ZipImporter *)obj;
char *fullname; char *fullname;
enum module_info mi; enum zi_module_info mi;
if (!PyArg_ParseTuple(args, "s:zipimporter.is_package", if (!PyArg_ParseTuple(args, "s:zipimporter.is_package",
&fullname)) &fullname))
@ -457,7 +457,7 @@ zipimporter_get_source(PyObject *obj, PyObject *args)
PyObject *toc_entry; PyObject *toc_entry;
char *fullname, *subname, path[MAXPATHLEN+1]; char *fullname, *subname, path[MAXPATHLEN+1];
int len; int len;
enum module_info mi; enum zi_module_info mi;
if (!PyArg_ParseTuple(args, "s:zipimporter.get_source", &fullname)) if (!PyArg_ParseTuple(args, "s:zipimporter.get_source", &fullname))
return NULL; return NULL;