diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-23 18:52:39 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-23 18:52:39 +0200 |
| commit | ca2822fba1a8b14d95a38bf83b68b46cf224c89d (patch) | |
| tree | c3706f242dadad496468894646634bf15ef4f6d7 /Python/dynload_next.c | |
| parent | 1802937d1c6583c845b347d86db0ce3d6f56545f (diff) | |
| parent | ca0b38c67382c8bc153913e2c1378dae038955fb (diff) | |
| download | cpython-ca2822fba1a8b14d95a38bf83b68b46cf224c89d.tar.gz | |
#16306: 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]; |