diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-03-20 22:12:14 -0400 |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-03-20 22:12:14 -0400 |
| commit | 4f9e787189db3d142c18d45c2757f07c0ea8413e (patch) | |
| tree | a283eb5ef2027fbd090f079001dd03090782ce40 /Python/dynload_next.c | |
| parent | 7ddb402f873b3a7242d4f129060073971f4ef536 (diff) | |
| parent | 5a798963eadb3caa3261326f6bb6925d127ffb5b (diff) | |
| download | cpython-4f9e787189db3d142c18d45c2757f07c0ea8413e.tar.gz | |
Merge: #5712: Preemptively fix some other possible timing issues.
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]; |