summaryrefslogtreecommitdiff
path: root/Python/dynload_next.c
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2016-07-10 14:10:08 -0400
committerR David Murray <rdmurray@bitdance.com>2016-07-10 14:10:08 -0400
commit87de053ac106f336b60770e127d3ea76360f4dda (patch)
treecb9b04c6880af9224feea058dd65de3823168202 /Python/dynload_next.c
parent425f915808a8da11d653b9d6ded523892d1de7b0 (diff)
parentdea7e3988f9d327e2a9d0af4473c2876b0ce8a00 (diff)
downloadcpython-87de053ac106f336b60770e127d3ea76360f4dda.tar.gz
#22758 null merge
Diffstat (limited to 'Python/dynload_next.c')
-rw-r--r--Python/dynload_next.c10
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];