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/dynload_next.c | |
| parent | f374fd439129c8845636dbcd6b9db788ca30ddc5 (diff) | |
| parent | 3afc106889340dadee60bd7407e11380d45c18e7 (diff) | |
| download | cpython-96e3c00794c56103677f83937276d9b36fafcbb6.tar.gz | |
#16210: merge with 3.2.
Diffstat (limited to 'Python/dynload_next.c')
| -rw-r--r-- | Python/dynload_next.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Python/dynload_next.c b/Python/dynload_next.c index cabf9b9663..85c95b41bb 100644 --- a/Python/dynload_next.c +++ b/Python/dynload_next.c @@ -8,11 +8,7 @@ #include <mach-o/dyld.h> -const struct filedescr _PyImport_DynLoadFiletab[] = { - {".so", "rb", C_EXTENSION}, - {"module.so", "rb", C_EXTENSION}, - {0, 0} -}; +const char *_PyImport_DynLoadFiletab[] = {".so", NULL}; /* ** Python modules are Mach-O MH_BUNDLE files. The best way to load these @@ -31,8 +27,8 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { #define LINKOPTIONS NSLINKMODULE_OPTION_BINDNOW| \ NSLINKMODULE_OPTION_RETURN_ON_ERROR|NSLINKMODULE_OPTION_PRIVATE #endif -dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, - const char *pathname, FILE *fp) +dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, + const char *pathname, FILE *fp) { dl_funcptr p = NULL; char funcname[258]; |