summaryrefslogtreecommitdiff
path: root/libguile/threads.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-01-30 18:25:07 +0100
committerAndy Wingo <wingo@pobox.com>2012-01-30 18:25:07 +0100
commit855db1905d56efcdf91ae51a9e80990f79030eae (patch)
tree9c918dba899ddae458147ce1095018fcbdec18b0 /libguile/threads.c
parent91ee7515da0bad91330ce5c87b250d6cf12a2789 (diff)
parent9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a (diff)
downloadguile-855db1905d56efcdf91ae51a9e80990f79030eae.tar.gz
Merge commit '9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a'
Conflicts: libguile/foreign.c module/ice-9/psyntax-pp.scm module/ice-9/psyntax.scm
Diffstat (limited to 'libguile/threads.c')
-rw-r--r--libguile/threads.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libguile/threads.c b/libguile/threads.c
index 0dba50f8a..463414f4a 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -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;
}