summaryrefslogtreecommitdiff
path: root/Python/dynload_os2.c
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-11-01 13:31:12 +0200
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-11-01 13:31:12 +0200
commitc83af6a2bda3609c435b6ce84f990256c593f3d4 (patch)
tree189c44827c3dba1a46ad12187f3dea03c549798f /Python/dynload_os2.c
parent7afede10a583e241aea0452c8bc9fe7522509873 (diff)
parent9e9e8c4bbb70e717829906215e42e2c398f28679 (diff)
downloadcpython-c83af6a2bda3609c435b6ce84f990256c593f3d4.tar.gz
Merge issue #16373: Prevent infinite recursion for ABC Set class operations.
Patch by Serhiy Storchaka.
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;