diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-04-13 18:06:42 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-04-13 18:06:42 -0400 |
| commit | c2c9c905706160bf34aea12f2348210aac3e0da2 (patch) | |
| tree | 9f7cc31fdab50fc9e80c1c9fd379e0b12414242a /Python/dynload_next.c | |
| parent | e307451be16e5bf59b38ec5aea76f68c0831fb65 (diff) | |
| parent | 77795fd1f148a037c9ab583968d85bfc009bc15c (diff) | |
| download | cpython-c2c9c905706160bf34aea12f2348210aac3e0da2.tar.gz | |
merge 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]; |