diff options
| author | R David Murray <rdmurray@bitdance.com> | 2012-04-13 21:27:19 -0400 |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2012-04-13 21:27:19 -0400 |
| commit | ea7bc055b08fb442986e0735b1b5b325b0b51ecc (patch) | |
| tree | 20c2b837c787daf7e95ece075e6544627b17625a /Python/dynload_shlib.c | |
| parent | c32365d2ce552d1d17279e30a564509235ffb1db (diff) | |
| parent | c2c9c905706160bf34aea12f2348210aac3e0da2 (diff) | |
| download | cpython-ea7bc055b08fb442986e0735b1b5b325b0b51ecc.tar.gz | |
Merge #14399: corrected news item
Diffstat (limited to 'Python/dynload_shlib.c')
| -rw-r--r-- | Python/dynload_shlib.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c index 7ea510e862..ab24238f57 100644 --- a/Python/dynload_shlib.c +++ b/Python/dynload_shlib.c @@ -39,7 +39,6 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { #ifdef __CYGWIN__ {".dll", "rb", C_EXTENSION}, - {"module.dll", "rb", C_EXTENSION}, #else /* !__CYGWIN__ */ #if defined(PYOS_OS2) && defined(PYCC_GCC) {".pyd", "rb", C_EXTENSION}, @@ -48,15 +47,10 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { #ifdef __VMS {".exe", "rb", C_EXTENSION}, {".EXE", "rb", C_EXTENSION}, - {"module.exe", "rb", C_EXTENSION}, - {"MODULE.EXE", "rb", C_EXTENSION}, #else /* !__VMS */ {"." SOABI ".so", "rb", C_EXTENSION}, - {"module." SOABI ".so", "rb", C_EXTENSION}, {".abi" PYTHON_ABI_STRING ".so", "rb", C_EXTENSION}, - {"module.abi" PYTHON_ABI_STRING ".so", "rb", C_EXTENSION}, {".so", "rb", C_EXTENSION}, - {"module.so", "rb", C_EXTENSION}, #endif /* __VMS */ #endif /* defined(PYOS_OS2) && defined(PYCC_GCC) */ #endif /* __CYGWIN__ */ @@ -75,7 +69,7 @@ static struct { static int nhandles = 0; -dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, +dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, const char *pathname, FILE *fp) { dl_funcptr p; |