diff options
| author | Guido van Rossum <guido@python.org> | 1997-07-21 14:54:36 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-07-21 14:54:36 +0000 |
| commit | 3ab5dda26bd84a781661f78f5730375f58ca8f2e (patch) | |
| tree | 616ca098dc16951cd0ffdb7583e62a726d3d6d12 /Python/importdl.c | |
| parent | f88dd3396b9e8fad2098544a839b083d402e5c36 (diff) | |
| download | cpython-3ab5dda26bd84a781661f78f5730375f58ca8f2e.tar.gz | |
Removed some variables that are used to exchange data between import.c and
importdl.c: the MAXSUFFIXSIZE macro is now defined in importdl.h, and
the modules dictionary is now passed using PyImport_GetModuleDict().
Also undefine USE_SHLIB for AIX -- in AIX 4.2 and up, dlfcn.h exists
but we don't want to use it.
Diffstat (limited to 'Python/importdl.c')
| -rw-r--r-- | Python/importdl.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Python/importdl.c b/Python/importdl.c index 436a8de533..44f57ac358 100644 --- a/Python/importdl.c +++ b/Python/importdl.c @@ -126,6 +126,7 @@ typedef void (*dl_funcptr)(); #endif #ifdef _AIX +#undef USE_SHLIB /* AIX 4.2 and higher have dlfcn.h but we don't want it */ #define DYNAMIC_LINK #define SHORT_EXT ".so" #define LONG_EXT "module.so" @@ -201,14 +202,6 @@ extern char *Py_GetProgramName(); #endif /* DYNAMIC_LINK */ -/* Max length of module suffix searched for -- accommodates "module.slb" */ -#ifndef MAXSUFFIXSIZE -#define MAXSUFFIXSIZE 12 -#endif - -/* Pass it on to import.c */ -int _PyImport_MaxSuffixSize = MAXSUFFIXSIZE; - struct filedescr _PyImport_Filetab[] = { #ifdef SHORT_EXT {SHORT_EXT, "rb", C_EXTENSION}, @@ -527,7 +520,7 @@ _PyImport_LoadDynamicModule(name, pathname, fp) (*p)(); /* XXX Need check for err_occurred() here */ - m = PyDict_GetItemString(_PyImport_Modules, name); + m = PyDict_GetItemString(PyImport_GetModuleDict(), name); if (m == NULL) { if (PyErr_Occurred() == NULL) PyErr_SetString(PyExc_SystemError, |