diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-09-15 00:23:08 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-09-15 00:23:08 +0200 |
| commit | 458032a249e61213cfd53f3e27dcc16003310812 (patch) | |
| tree | 7a2b9eec68501024a0ef4fc35b5ebf2b1df3433d /Python/dynload_next.c | |
| parent | 7151648468b2f2c3f02ded08a369343693c5dcd8 (diff) | |
| parent | febef19231812bb0c0afe128320aa4790aaa3911 (diff) | |
| download | cpython-458032a249e61213cfd53f3e27dcc16003310812.tar.gz | |
Merge 3.4 (test_gdb)
Diffstat (limited to 'Python/dynload_next.c')
| -rw-r--r-- | Python/dynload_next.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Python/dynload_next.c b/Python/dynload_next.c index 85c95b41bb..83a8b2bb31 100644 --- a/Python/dynload_next.c +++ b/Python/dynload_next.c @@ -27,8 +27,9 @@ const char *_PyImport_DynLoadFiletab[] = {".so", NULL}; #define LINKOPTIONS NSLINKMODULE_OPTION_BINDNOW| \ NSLINKMODULE_OPTION_RETURN_ON_ERROR|NSLINKMODULE_OPTION_PRIVATE #endif -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) { dl_funcptr p = NULL; char funcname[258]; @@ -39,7 +40,7 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, const char *errString; char errBuf[512]; - PyOS_snprintf(funcname, sizeof(funcname), "_PyInit_%.200s", shortname); + PyOS_snprintf(funcname, sizeof(funcname), "_%.20s_%.200s", prefix, shortname); #ifdef USE_DYLD_GLOBAL_NAMESPACE if (NSIsSymbolNameDefined(funcname)) { |