summaryrefslogtreecommitdiff
path: root/Python/dynload_next.c
diff options
context:
space:
mode:
authorMark Dickinson <mdickinson@enthought.com>2012-10-31 19:45:05 +0000
committerMark Dickinson <mdickinson@enthought.com>2012-10-31 19:45:05 +0000
commitb68dcb7718ee0b66d9943d5f8f5cfff9dd63291c (patch)
tree6613b92662f0b49c0c175110f7ad7141f0d735fa /Python/dynload_next.c
parent6f2c7167b3d56676b76d6b37bdc92271a2aa1442 (diff)
parenta544cdd8453491733923297e43fd8e8f31f31a81 (diff)
downloadcpython-b68dcb7718ee0b66d9943d5f8f5cfff9dd63291c.tar.gz
Issue #16348: merge fix from 3.2.
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];