summaryrefslogtreecommitdiff
path: root/Python/dynload_dl.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-10-06 19:42:02 -0700
committerBenjamin Peterson <benjamin@python.org>2015-10-06 19:42:02 -0700
commitc16b8b405e790c04e4062a4b1231ba56387e4273 (patch)
tree7e6120af47d7413550634e652c8e827603c5c615 /Python/dynload_dl.c
parent07929c5f6dd69c554889910bf5988ad6c31f5593 (diff)
parent65e767b0df52dd8262d49f3c1ea1ae3567bb4d47 (diff)
downloadcpython-c16b8b405e790c04e4062a4b1231ba56387e4273.tar.gz
merge 3.4 (#24806)
Diffstat (limited to 'Python/dynload_dl.c')
-rw-r--r--Python/dynload_dl.c7
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);
}