diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-11-03 15:11:53 -0500 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-11-03 15:11:53 -0500 |
| commit | c84f5e48d5387cbcb779c9354132bb6a48d07ea3 (patch) | |
| tree | eea40c044a2802b7112691f1614766faea81af2e /Python/dynload_next.c | |
| parent | 41540bf9aa1b0dfb206088945acfd7bb74d440d0 (diff) | |
| parent | 00261b71a55839b4b53a50d7ab7b416110570d10 (diff) | |
| download | cpython-c84f5e48d5387cbcb779c9354132bb6a48d07ea3.tar.gz | |
merge 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]; |