diff options
| author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-11-01 13:31:12 +0200 |
|---|---|---|
| committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-11-01 13:31:12 +0200 |
| commit | c83af6a2bda3609c435b6ce84f990256c593f3d4 (patch) | |
| tree | 189c44827c3dba1a46ad12187f3dea03c549798f /Python/dynload_next.c | |
| parent | 7afede10a583e241aea0452c8bc9fe7522509873 (diff) | |
| parent | 9e9e8c4bbb70e717829906215e42e2c398f28679 (diff) | |
| download | cpython-c83af6a2bda3609c435b6ce84f990256c593f3d4.tar.gz | |
Merge issue #16373: Prevent infinite recursion for ABC Set class operations.
Patch by Serhiy Storchaka.
Diffstat (limited to 'Python/dynload_next.c')
| -rw-r--r-- | Python/dynload_next.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Python/dynload_next.c b/Python/dynload_next.c index cabf9b9663..85c95b41bb 100644 --- a/Python/dynload_next.c +++ b/Python/dynload_next.c @@ -8,11 +8,7 @@ #include <mach-o/dyld.h> -const struct filedescr _PyImport_DynLoadFiletab[] = { - {".so", "rb", C_EXTENSION}, - {"module.so", "rb", C_EXTENSION}, - {0, 0} -}; +const char *_PyImport_DynLoadFiletab[] = {".so", NULL}; /* ** Python modules are Mach-O MH_BUNDLE files. The best way to load these @@ -31,8 +27,8 @@ const struct filedescr _PyImport_DynLoadFiletab[] = { #define LINKOPTIONS NSLINKMODULE_OPTION_BINDNOW| \ NSLINKMODULE_OPTION_RETURN_ON_ERROR|NSLINKMODULE_OPTION_PRIVATE #endif -dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, - const char *pathname, FILE *fp) +dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, + const char *pathname, FILE *fp) { dl_funcptr p = NULL; char funcname[258]; |