diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-15 03:39:38 -0400 |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-15 03:39:38 -0400 |
| commit | b31dd66880382354402b589317ee15473936655d (patch) | |
| tree | 68c9933482ba01f8659e0fe66a16a6d779a7ad4b /Python/dynload_dl.c | |
| parent | aff3084a94f77c7c8670a2787d2548bedc7193d2 (diff) | |
| parent | c78d501f52d4893f287f4b7b2f00cc96de78d7e3 (diff) | |
| download | cpython-b31dd66880382354402b589317ee15473936655d.tar.gz | |
Merge with 3.2: issue #17047 news entry
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); } |