hopefully fix xform interaction with FDSET_LIMIT
svn: r7825
This commit is contained in:
parent
19d59da08b
commit
28980d9e4e
|
@ -2480,8 +2480,9 @@ scheme_lookup_binding(Scheme_Object *find_id, Scheme_Comp_Env *env, int flags,
|
||||||
|
|
||||||
if (!genv) {
|
if (!genv) {
|
||||||
scheme_wrong_syntax("require", NULL, src_find_id,
|
scheme_wrong_syntax("require", NULL, src_find_id,
|
||||||
"broken compiled code (phase %d, defn-phase %d): cannot find module %D",
|
"namespace mismatch; reference (phase %d) to a module"
|
||||||
env->genv->phase, mod_defn_phase, modname);
|
" %D that is not instantiated (phase %d)",
|
||||||
|
env->genv->phase, modname, mod_defn_phase);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1731,11 +1731,13 @@ static Scheme_Object *link_module_variable(Scheme_Object *modidx,
|
||||||
|
|
||||||
if (!menv) {
|
if (!menv) {
|
||||||
scheme_wrong_syntax("link", NULL, varname,
|
scheme_wrong_syntax("link", NULL, varname,
|
||||||
"broken compiled code (phase %d, defn-phase %d, in %D), no declaration for module"
|
"namespace mismatch; reference (phase %d) to a module"
|
||||||
": %D",
|
" %D that is not instantiated (phase %d); reference"
|
||||||
env->phase, mod_phase,
|
" appears in module: %D",
|
||||||
env->module ? env->module->modname : scheme_false,
|
env->phase,
|
||||||
modname);
|
modname,
|
||||||
|
mod_phase,
|
||||||
|
env->module ? env->module->modname : scheme_false);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -771,7 +771,7 @@ void scheme_fdset(void *fd, int n)
|
||||||
#endif
|
#endif
|
||||||
#if defined(FILES_HAVE_FDS) || defined(USE_SOCKETS_TCP)
|
#if defined(FILES_HAVE_FDS) || defined(USE_SOCKETS_TCP)
|
||||||
# define STORED_ACTUAL_FDSET_LIMIT
|
# define STORED_ACTUAL_FDSET_LIMIT
|
||||||
# define FDSET_LIMIT(fd) (*(int *)((char *)fd + dynamic_fd_size))
|
# define FDSET_LIMIT(fd) (*(int *)((char *)fd XFORM_OK_PLUS dynamic_fd_size))
|
||||||
int mx;
|
int mx;
|
||||||
mx = FDSET_LIMIT(fd);
|
mx = FDSET_LIMIT(fd);
|
||||||
if (n > mx)
|
if (n > mx)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user