mirror of
https://github.com/python/cpython.git
synced 2025-09-11 03:07:01 +00:00
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.
This commit is contained in:
parent
766118525a
commit
ef3d02ebb9
3 changed files with 6 additions and 14 deletions
|
@ -61,7 +61,7 @@ extern long PyOS_GetLastModificationTime(); /* In getmtime.c */
|
|||
/* New way to come up with the magic number: (YEAR-1995), MONTH, DAY */
|
||||
#define MAGIC (20121 | ((long)'\r'<<16) | ((long)'\n'<<24))
|
||||
|
||||
PyObject *_PyImport_Modules; /* This becomes sys.modules */
|
||||
static PyObject *_PyImport_Modules; /* This becomes sys.modules */
|
||||
|
||||
|
||||
/* Initialize things */
|
||||
|
@ -461,7 +461,7 @@ find_module(name, path, buf, buflen, p_fp)
|
|||
if (!PyString_Check(v))
|
||||
continue;
|
||||
len = PyString_Size(v);
|
||||
if (len + 2 + namelen + _PyImport_MaxSuffixSize >= buflen)
|
||||
if (len + 2 + namelen + MAXSUFFIXSIZE >= buflen)
|
||||
continue; /* Too long */
|
||||
strcpy(buf, PyString_AsString(v));
|
||||
if ((int)strlen(buf) != len)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue