summaryrefslogtreecommitdiff
path: root/Python/dynload_os2.c
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-11-18 23:15:47 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2012-11-18 23:15:47 +0200
commit39fa7d50adc21e7d39f1f869ad77eee2586b0bb1 (patch)
tree014a70b47cdc5e701d9767fa96291d37aabdf5ac /Python/dynload_os2.c
parent9c52dd894ed588fe4c6a9ca3ee32c7098ed84e7b (diff)
parent37f512c84d312d229014c3de550870dfb3b3ac55 (diff)
downloadcpython-39fa7d50adc21e7d39f1f869ad77eee2586b0bb1.tar.gz
#7782: merge with 3.2.
Diffstat (limited to 'Python/dynload_os2.c')
-rw-r--r--Python/dynload_os2.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/Python/dynload_os2.c b/Python/dynload_os2.c
index 101c024bbe..0e1b907b8c 100644
--- a/Python/dynload_os2.c
+++ b/Python/dynload_os2.c
@@ -9,13 +9,9 @@
#include "importdl.h"
-const struct filedescr _PyImport_DynLoadFiletab[] = {
- {".pyd", "rb", C_EXTENSION},
- {".dll", "rb", C_EXTENSION},
- {0, 0}
-};
+const char *_PyImport_DynLoadFiletab[] = {".pyd", ".dll", NULL};
-dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
const char *pathname, FILE *fp)
{
dl_funcptr p;