diff options
| author | Mark Dickinson <mdickinson@enthought.com> | 2012-04-15 15:12:37 +0100 |
|---|---|---|
| committer | Mark Dickinson <mdickinson@enthought.com> | 2012-04-15 15:12:37 +0100 |
| commit | 0276a326e15ced5fe6494d40658e9652ac90c5d5 (patch) | |
| tree | a6b2218dbfd8082a7976f7ae7b22c7e138a201a0 /Python/dynload_next.c | |
| parent | 4536a907e314836a320414ee5bf3bf7557fef7b6 (diff) | |
| parent | 3cd6793317074f286add6fff3627776fe3a50483 (diff) | |
| download | cpython-0276a326e15ced5fe6494d40658e9652ac90c5d5.tar.gz | |
Issue #13889: Merge fix from 3.2.
Diffstat (limited to 'Python/dynload_next.c')
| -rw-r--r-- | Python/dynload_next.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Python/dynload_next.c b/Python/dynload_next.c index cabf9b9663..5caff8bc9c 100644 --- a/Python/dynload_next.c +++ b/Python/dynload_next.c @@ -10,7 +10,6 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { {".so", "rb", C_EXTENSION}, - {"module.so", "rb", C_EXTENSION}, {0, 0} }; @@ -31,8 +30,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]; |