diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-10-06 19:42:02 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-10-06 19:42:02 -0700 |
| commit | c16b8b405e790c04e4062a4b1231ba56387e4273 (patch) | |
| tree | 7e6120af47d7413550634e652c8e827603c5c615 /Python/dynload_hpux.c | |
| parent | 07929c5f6dd69c554889910bf5988ad6c31f5593 (diff) | |
| parent | 65e767b0df52dd8262d49f3c1ea1ae3567bb4d47 (diff) | |
| download | cpython-c16b8b405e790c04e4062a4b1231ba56387e4273.tar.gz | |
merge 3.4 (#24806)
Diffstat (limited to 'Python/dynload_hpux.c')
| -rw-r--r-- | Python/dynload_hpux.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Python/dynload_hpux.c b/Python/dynload_hpux.c index c9554148cc..4967afc39c 100644 --- a/Python/dynload_hpux.c +++ b/Python/dynload_hpux.c @@ -8,15 +8,16 @@ #include "importdl.h" #if defined(__hp9000s300) -#define FUNCNAME_PATTERN "_PyInit_%.200s" +#define FUNCNAME_PATTERN "_%.20s_%.200s" #else -#define FUNCNAME_PATTERN "PyInit_%.200s" +#define FUNCNAME_PATTERN "%.20s_%.200s" #endif const char *_PyImport_DynLoadFiletab[] = {SHLIB_EXT, 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) { dl_funcptr p; shl_t lib; @@ -50,7 +51,8 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, Py_DECREF(pathname_ob); return NULL; } - PyOS_snprintf(funcname, sizeof(funcname), FUNCNAME_PATTERN, shortname); + PyOS_snprintf(funcname, sizeof(funcname), FUNCNAME_PATTERN, + prefix, shortname); if (Py_VerboseFlag) printf("shl_findsym %s\n", funcname); if (shl_findsym(&lib, funcname, TYPE_UNDEFINED, (void *) &p) == -1) { |