diff options
| author | Brian Curtin <brian@python.org> | 2012-10-29 18:18:43 -0500 |
|---|---|---|
| committer | Brian Curtin <brian@python.org> | 2012-10-29 18:18:43 -0500 |
| commit | b19640efa481eecf87bbe419e1fa24e366563cbe (patch) | |
| tree | f3f9a615dc59445f8fb97a8e3172ee312f7e571f /Python/dynload_next.c | |
| parent | fa239e6facc278d78c5871282f91d66fda3526cc (diff) | |
| parent | abaa19626bed9ef7d6b1cc62904d57de561200e6 (diff) | |
| download | cpython-b19640efa481eecf87bbe419e1fa24e366563cbe.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]; |