summaryrefslogtreecommitdiff
path: root/Python/dynload_dl.c
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-04-29 11:48:54 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2012-04-29 11:48:54 +0300
commitce4b511ca279b2898d2f7a13b6efe095690bcdc1 (patch)
tree9e1a28a02f873241d6a3ad472e82cca094bb6c1b /Python/dynload_dl.c
parentfca739226ac00e6010c8dc236a3a68efa0b85100 (diff)
parentc22734e8102a45943208dfa1fff00e481d63cc45 (diff)
downloadcpython-ce4b511ca279b2898d2f7a13b6efe095690bcdc1.tar.gz
#14519: merge with 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);
}