mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-17 01:00:20 +02:00
Merge commit '9b0975f1dc
'
Conflicts: libguile/foreign.c module/ice-9/psyntax-pp.scm module/ice-9/psyntax.scm
This commit is contained in:
commit
855db1905d
331 changed files with 1929 additions and 817 deletions
|
@ -550,7 +550,7 @@ guilify_self_1 (struct GC_stack_base *base)
|
|||
t.critical_section_level = 0;
|
||||
t.base = base->mem_base;
|
||||
#ifdef __ia64__
|
||||
t.register_backing_store_base = base->reg-base;
|
||||
t.register_backing_store_base = base->reg_base;
|
||||
#endif
|
||||
t.continuation_root = SCM_EOL;
|
||||
t.continuation_base = t.base;
|
||||
|
@ -1127,6 +1127,8 @@ scm_spawn_thread (scm_t_catch_body body, void *body_data,
|
|||
scm_i_scm_pthread_cond_wait (&data.cond, &data.mutex);
|
||||
scm_i_pthread_mutex_unlock (&data.mutex);
|
||||
|
||||
assert (SCM_I_IS_THREAD (data.thread));
|
||||
|
||||
return data.thread;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue