summaryrefslogtreecommitdiff
path: root/Python/importdl.h
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-11-29 02:26:15 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2012-11-29 02:26:15 +0200
commit8f539b591e32b51b7c9b39da3745698feb271b22 (patch)
treee3df2cd474923eda78b8fa864b941850d58ab3c5 /Python/importdl.h
parent21b88b83f813a30f697b2e8de188da7ee329baf1 (diff)
parent2d1300dfc934efc5242a6cf3753e2724f3bbc946 (diff)
downloadcpython-8f539b591e32b51b7c9b39da3745698feb271b22.tar.gz
#16476: merge with 3.2.
Diffstat (limited to 'Python/importdl.h')
-rw-r--r--Python/importdl.h26
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" */