diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-10-24 23:06:56 +0300 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-10-24 23:06:56 +0300 |
| commit | 96e3c00794c56103677f83937276d9b36fafcbb6 (patch) | |
| tree | 02a1ae77d5a41cab6f22b076745f37488891d97d /Python/importdl.h | |
| parent | f374fd439129c8845636dbcd6b9db788ca30ddc5 (diff) | |
| parent | 3afc106889340dadee60bd7407e11380d45c18e7 (diff) | |
| download | cpython-96e3c00794c56103677f83937276d9b36fafcbb6.tar.gz | |
#16210: merge with 3.2.
Diffstat (limited to 'Python/importdl.h')
| -rw-r--r-- | Python/importdl.h | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/Python/importdl.h b/Python/importdl.h index b4d21be6f0..6b9cf750a4 100644 --- a/Python/importdl.h +++ b/Python/importdl.h @@ -6,29 +6,9 @@ extern "C" { #endif -/* Definitions for dynamic loading of extension modules */ -enum filetype { - SEARCH_ERROR, - PY_SOURCE, - PY_COMPILED, - C_EXTENSION, - PY_RESOURCE, /* Mac only */ - PKG_DIRECTORY, - C_BUILTIN, - PY_FROZEN, - PY_CODERESOURCE, /* Mac only */ - IMP_HOOK -}; - -struct filedescr { - char *suffix; - char *mode; - enum filetype type; -}; -extern struct filedescr * _PyImport_Filetab; -extern const struct filedescr _PyImport_DynLoadFiletab[]; - -extern PyObject *_PyImport_LoadDynamicModule(char *name, char *pathname, +extern const char *_PyImport_DynLoadFiletab[]; + +extern PyObject *_PyImport_LoadDynamicModule(PyObject *name, PyObject *pathname, FILE *); /* Max length of module suffix searched for -- accommodates "module.slb" */ |