diff options
| author | Mark Dickinson <mdickinson@enthought.com> | 2012-11-04 11:47:05 +0000 |
|---|---|---|
| committer | Mark Dickinson <mdickinson@enthought.com> | 2012-11-04 11:47:05 +0000 |
| commit | dc7ff1e29901fae6638fdc1d479baf286bc0e803 (patch) | |
| tree | 45597bbe423645bf4fd5ec871a997ca259ea241a /Python/importdl.h | |
| parent | 0aa28427436d28677a21516db5cd7ea0da4f16df (diff) | |
| parent | a81097d364b3259f7f9b03508fc5acfc28c56a8e (diff) | |
| download | cpython-dc7ff1e29901fae6638fdc1d479baf286bc0e803.tar.gz | |
Issue #16402: Merge fix from 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" */ |