diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-29 02:26:15 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-29 02:26:15 +0200 |
| commit | 8f539b591e32b51b7c9b39da3745698feb271b22 (patch) | |
| tree | e3df2cd474923eda78b8fa864b941850d58ab3c5 /Python/dynload_dl.c | |
| parent | 21b88b83f813a30f697b2e8de188da7ee329baf1 (diff) | |
| parent | 2d1300dfc934efc5242a6cf3753e2724f3bbc946 (diff) | |
| download | cpython-8f539b591e32b51b7c9b39da3745698feb271b22.tar.gz | |
#16476: merge with 3.2.
Diffstat (limited to 'Python/dynload_dl.c')
| -rw-r--r-- | Python/dynload_dl.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Python/dynload_dl.c b/Python/dynload_dl.c index 2606e1e32f..5836cb3b29 100644 --- a/Python/dynload_dl.c +++ b/Python/dynload_dl.c @@ -9,18 +9,14 @@ extern char *Py_GetProgramName(void); -const struct filedescr _PyImport_DynLoadFiletab[] = { - {".o", "rb", C_EXTENSION}, - {"module.o", "rb", C_EXTENSION}, - {0, 0} -}; +const char *_PyImport_DynLoadFiletab[] = {".o", NULL}; -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) { - char funcname[258]; + char funcname[258]; - PyOS_snprintf(funcname, sizeof(funcname), "PyInit_%.200s", shortname); - return dl_loadmod(Py_GetProgramName(), pathname, funcname); + PyOS_snprintf(funcname, sizeof(funcname), "PyInit_%.200s", shortname); + return dl_loadmod(Py_GetProgramName(), pathname, funcname); } |