diff options
| author | Guido van Rossum <guido@python.org> | 1998-05-18 13:42:45 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1998-05-18 13:42:45 (GMT) |
| commit | 6b077878a54ce66e6e4e1f0a9c5034bd6671a79e (patch) | |
| tree | f65d971abeb8712c8f2a0e3c8ed3c6d2db9cdf35 /Python | |
| parent | c85be6a0ff872f2fe90bc60c9fc3683e673ac060 (diff) | |
| download | cpython-6b077878a54ce66e6e4e1f0a9c5034bd6671a79e.zip cpython-6b077878a54ce66e6e4e1f0a9c5034bd6671a79e.tar.gz cpython-6b077878a54ce66e6e4e1f0a9c5034bd6671a79e.tar.bz2 | |
Remove use of RTLD_GLOBAL.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/importdl.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Python/importdl.c b/Python/importdl.c index 1a994ce..fe025c0 100644 --- a/Python/importdl.c +++ b/Python/importdl.c @@ -182,9 +182,6 @@ typedef void (*dl_funcptr)(); #ifndef RTLD_LAZY #define RTLD_LAZY 1 #endif -#ifndef RTLD_GLOBAL -#define RTLD_GLOBAL 0 -#endif #define SHORT_EXT ".so" #define LONG_EXT "module.so" #endif /* USE_SHLIB */ @@ -376,13 +373,13 @@ _PyImport_LoadDynamicModule(name, pathname, fp) #ifdef RTLD_NOW /* RTLD_NOW: resolve externals now (i.e. core dump now if some are missing) */ - void *handle = dlopen(pathname, RTLD_NOW | RTLD_GLOBAL); + void *handle = dlopen(pathname, RTLD_NOW); #else void *handle; if (Py_VerboseFlag) printf("dlopen(\"%s\", %d);\n", pathname, - RTLD_LAZY | RTLD_GLOBAL); - handle = dlopen(pathname, RTLD_LAZY | RTLD_GLOBAL); + RTLD_LAZY); + handle = dlopen(pathname, RTLD_LAZY); #endif /* RTLD_NOW */ if (handle == NULL) { PyErr_SetString(PyExc_ImportError, dlerror()); @@ -562,6 +559,7 @@ _PyImport_LoadDynamicModule(name, pathname, fp) printf("shl_load %s\n",pathname); } lib = shl_load(pathname, flags, 0); + /* XXX Chuck Blake once wrote that 0 should be BIND_NOSTART? */ if (lib == NULL) { char buf[256]; |