diff options
| author | Raymond Hettinger <python@rcn.com> | 2004-11-10 13:08:35 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2004-11-10 13:08:35 (GMT) |
| commit | 2c45c9ae57e23001c35c791cf7fc68b55f0d78b6 (patch) | |
| tree | 2bb816adcb11e75936540596a217e6baac770828 /Modules/zipimport.c | |
| parent | 41f7038a3e685a05b648b1d920bfb0bbcba5e632 (diff) | |
| download | cpython-2c45c9ae57e23001c35c791cf7fc68b55f0d78b6.zip cpython-2c45c9ae57e23001c35c791cf7fc68b55f0d78b6.tar.gz cpython-2c45c9ae57e23001c35c791cf7fc68b55f0d78b6.tar.bz2 | |
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.
Diffstat (limited to 'Modules/zipimport.c')
| -rw-r--r-- | Modules/zipimport.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/zipimport.c b/Modules/zipimport.c index b229088..9630dea 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -250,7 +250,7 @@ make_filename(char *prefix, char *name, char *path) return len; } -enum module_info { +enum zi_module_info { MI_ERROR, MI_NOT_FOUND, MI_MODULE, @@ -258,7 +258,7 @@ enum module_info { }; /* 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_find_module(PyObject *obj, PyObject *args) 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_is_package(PyObject *obj, PyObject *args) { 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 @@ zipimporter_get_source(PyObject *obj, PyObject *args) 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; |