diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-03-20 21:55:14 -0400 |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-03-20 21:55:14 -0400 |
| commit | 5a798963eadb3caa3261326f6bb6925d127ffb5b (patch) | |
| tree | 9b637b3780a7bc298d041b4ff9f54e41b22774a0 /Python/dynload_next.c | |
| parent | cf761fd932e233dc2504c0f9d031f37ca74cd24f (diff) | |
| parent | 47f6db5883ca9667de17cdaeba3c0798ec8ddba2 (diff) | |
| download | cpython-5a798963eadb3caa3261326f6bb6925d127ffb5b.tar.gz | |
Merge: #5713: fix timing issue in smtplib tests.
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]; |