From 9f65081d90dcc40650adffd2ed730ff5eb1e47c0 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 20 Dec 1999 21:22:24 +0000 Subject: [PATCH] Some rearrangements for the importdl.c restructuring. This is part of a set of patches by Greg Stein. --- Python/importdl.h | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/Python/importdl.h b/Python/importdl.h index 230904396cc..5c729a87139 100644 --- a/Python/importdl.h +++ b/Python/importdl.h @@ -1,3 +1,10 @@ +#ifndef Py_IMPORTDL_H +#define Py_IMPORTDL_H + +#ifdef __cplusplus +extern "C" { +#endif + /*********************************************************** Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam, The Netherlands. @@ -42,14 +49,32 @@ enum filetype { PY_CODERESOURCE /* Mac only */ }; -extern struct filedescr { +struct filedescr { char *suffix; char *mode; enum filetype type; -} _PyImport_Filetab[]; +}; +extern struct filedescr * _PyImport_Filetab; +extern const struct filedescr _PyImport_DynLoadFiletab[]; extern PyObject *_PyImport_LoadDynamicModule Py_PROTO((char *name, char *pathname, FILE *)); /* Max length of module suffix searched for -- accommodates "module.slb" */ #define MAXSUFFIXSIZE 12 + +#ifdef MS_WINDOWS +typedef FARPROC dl_funcptr; +#else +#ifdef PYOS_OS2 +typedef int (* APIENTRY dl_funcptr)(); +#else +typedef void (*dl_funcptr)(void); +#endif +#endif + + +#ifdef __cplusplus +} +#endif +#endif /* !Py_IMPORTDL_H */