diff options
| author | Lars Gust?bel <lars@gustaebel.de> | 2015-07-02 19:41:03 +0200 |
|---|---|---|
| committer | Lars Gust?bel <lars@gustaebel.de> | 2015-07-02 19:41:03 +0200 |
| commit | a0333aa657baeb3738a8c2fe211168cb1dbab8ac (patch) | |
| tree | 9d48b355036c218e706d4e0c698fc3586673bd5b /Python/dynload_dl.c | |
| parent | e8c3a8aa583475fa33dd8b74959193217cb56933 (diff) | |
| parent | c6050850b5f399a24702795515d02fdf06b01b4f (diff) | |
| download | cpython-a0333aa657baeb3738a8c2fe211168cb1dbab8ac.tar.gz | |
Merge with 3.4: Issue #24514: tarfile now tolerates number fields consisting of only whitespace.
Diffstat (limited to 'Python/dynload_dl.c')
| -rw-r--r-- | Python/dynload_dl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Python/dynload_dl.c b/Python/dynload_dl.c index 5836cb3b29..2bec645fbd 100644 --- a/Python/dynload_dl.c +++ b/Python/dynload_dl.c @@ -12,11 +12,12 @@ extern char *Py_GetProgramName(void); const char *_PyImport_DynLoadFiletab[] = {".o", NULL}; -dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, - const char *pathname, FILE *fp) +dl_funcptr _PyImport_FindSharedFuncptr(const char *prefix, + const char *shortname, + const char *pathname, FILE *fp) { char funcname[258]; - PyOS_snprintf(funcname, sizeof(funcname), "PyInit_%.200s", shortname); + PyOS_snprintf(funcname, sizeof(funcname), "%.20s_%.200s", prefix, shortname); return dl_loadmod(Py_GetProgramName(), pathname, funcname); } |