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_hpux.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_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) { |