Merge 3.2

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" */