summaryrefslogtreecommitdiff
path: root/Python/dynload_dl.c
diff options
context:
space:
mode:
authorMark Dickinson <mdickinson@enthought.com>2012-04-15 15:12:37 +0100
committerMark Dickinson <mdickinson@enthought.com>2012-04-15 15:12:37 +0100
commit0276a326e15ced5fe6494d40658e9652ac90c5d5 (patch)
treea6b2218dbfd8082a7976f7ae7b22c7e138a201a0 /Python/dynload_dl.c
parent4536a907e314836a320414ee5bf3bf7557fef7b6 (diff)
parent3cd6793317074f286add6fff3627776fe3a50483 (diff)
downloadcpython-0276a326e15ced5fe6494d40658e9652ac90c5d5.tar.gz
Issue #13889: Merge fix from 3.2.
Diffstat (limited to 'Python/dynload_dl.c')
-rw-r--r--Python/dynload_dl.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/Python/dynload_dl.c b/Python/dynload_dl.c
index 2606e1e32f..a914a0846e 100644
--- a/Python/dynload_dl.c
+++ b/Python/dynload_dl.c
@@ -10,17 +10,16 @@
extern char *Py_GetProgramName(void);
const struct filedescr _PyImport_DynLoadFiletab[] = {
- {".o", "rb", C_EXTENSION},
- {"module.o", "rb", C_EXTENSION},
- {0, 0}
+ {".o", "rb", C_EXTENSION},
+ {0, 0}
};
-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)
{
- char funcname[258];
+ char funcname[258];
- PyOS_snprintf(funcname, sizeof(funcname), "PyInit_%.200s", shortname);
- return dl_loadmod(Py_GetProgramName(), pathname, funcname);
+ PyOS_snprintf(funcname, sizeof(funcname), "PyInit_%.200s", shortname);
+ return dl_loadmod(Py_GetProgramName(), pathname, funcname);
}