From f0473d511b7f883bfff3048f55e3a6adc7a43cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Wed, 18 Jul 2001 16:17:16 +0000 Subject: Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Add dlopenflags to PyInterpreterState, and use it in dlopen calls. --- Python/dynload_shlib.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'Python/dynload_shlib.c') diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c index 7c8bfd2c3b..7de3b7d43e 100644 --- a/Python/dynload_shlib.c +++ b/Python/dynload_shlib.c @@ -22,10 +22,6 @@ #define LEAD_UNDERSCORE "" #endif -#ifndef RTLD_LAZY -#define RTLD_LAZY 1 -#endif - const struct filedescr _PyImport_DynLoadFiletab[] = { #ifdef __CYGWIN__ @@ -53,6 +49,7 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, void *handle; char funcname[258]; char pathbuf[260]; + int dlopenflags=0; if (strchr(pathname, '/') == NULL) { /* Prefix bare filename with "./" */ @@ -80,16 +77,13 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, } } -#ifdef RTLD_NOW - /* RTLD_NOW: resolve externals now - (i.e. core dump now if some are missing) */ - handle = dlopen(pathname, RTLD_NOW); -#else + dlopenflags = PyThreadState_Get()->interp->dlopenflags; + if (Py_VerboseFlag) - printf("dlopen(\"%s\", %d);\n", pathname, - RTLD_LAZY); - handle = dlopen(pathname, RTLD_LAZY); -#endif /* RTLD_NOW */ + printf("dlopen(\"%s\", %x);\n", pathname, dlopenflags); + + handle = dlopen(pathname, dlopenflags); + if (handle == NULL) { PyErr_SetString(PyExc_ImportError, dlerror()); return NULL; -- cgit v1.2.1