diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-13 21:35:07 -0400 |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-13 21:35:07 -0400 |
| commit | 6e1f43c7134a81fa559ae0958d257de28337ab6f (patch) | |
| tree | 6d1e53c5b5637f60f96fddad23ec2072daa0ef60 /Python/dynload_next.c | |
| parent | 8c41e21d39e424334a15a2e9ac922f0ac0f59a39 (diff) | |
| parent | 3a12ade6e1b2a96e92348ed851c8fa66d20dfa99 (diff) | |
| download | cpython-6e1f43c7134a81fa559ae0958d257de28337ab6f.tar.gz | |
Merge with 3.2: Issue #17386
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]; |