diff options
author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-31 22:06:27 +0200 |
---|---|---|
committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-31 22:06:27 +0200 |
commit | 7edfeccb35c1837dd86ff710d939f9500dcdc225 (patch) | |
tree | 90b8984ed7fd7f8d82304a6bd33c420dfc57114c /Python/dynload_next.c | |
parent | d4bcf4143dfc78fbb388ed8b6171f28a049168ea (diff) | |
parent | 1af921ad1ae77dc7e1fa0684bdfa080a77f4769a (diff) | |
download | cpython-7edfeccb35c1837dd86ff710d939f9500dcdc225.tar.gz |
null merge
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]; |