mirror of
https://github.com/python/cpython.git
synced 2025-08-22 09:45:06 +00:00
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines Untabify C files. Will watch buildbots. ........
This commit is contained in:
parent
ba32864b2d
commit
c7c96a90bc
321 changed files with 195492 additions and 195492 deletions
|
@ -39,8 +39,8 @@ PERFORMANCE OF THIS SOFTWARE.
|
|||
|
||||
|
||||
const struct filedescr _PyImport_DynLoadFiletab[] = {
|
||||
{"/pyd", "rb", C_EXTENSION},
|
||||
{0, 0}
|
||||
{"/pyd", "rb", C_EXTENSION},
|
||||
{0, 0}
|
||||
};
|
||||
|
||||
void dynload_init_dummy()
|
||||
|
@ -48,16 +48,16 @@ void dynload_init_dummy()
|
|||
}
|
||||
|
||||
dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
|
||||
char *pathname, FILE *fp)
|
||||
char *pathname, FILE *fp)
|
||||
{
|
||||
int err;
|
||||
char errstr[256];
|
||||
void (*init_function)(void);
|
||||
int err;
|
||||
char errstr[256];
|
||||
void (*init_function)(void);
|
||||
|
||||
err = dlk_load_no_init(pathname, &init_function);
|
||||
if (err) {
|
||||
PyOS_snprintf(errstr, sizeof(errstr), "dlk failure %d", err);
|
||||
PyErr_SetString(PyExc_ImportError, errstr);
|
||||
}
|
||||
return init_function;
|
||||
err = dlk_load_no_init(pathname, &init_function);
|
||||
if (err) {
|
||||
PyOS_snprintf(errstr, sizeof(errstr), "dlk failure %d", err);
|
||||
PyErr_SetString(PyExc_ImportError, errstr);
|
||||
}
|
||||
return init_function;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue