diff options
author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-31 22:06:27 +0200 |
---|---|---|
committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-31 22:06:27 +0200 |
commit | 7edfeccb35c1837dd86ff710d939f9500dcdc225 (patch) | |
tree | 90b8984ed7fd7f8d82304a6bd33c420dfc57114c /Python/dynload_dl.c | |
parent | d4bcf4143dfc78fbb388ed8b6171f28a049168ea (diff) | |
parent | 1af921ad1ae77dc7e1fa0684bdfa080a77f4769a (diff) | |
download | cpython-7edfeccb35c1837dd86ff710d939f9500dcdc225.tar.gz |
null merge
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); } |