From e6f63071a3f7721f55220514b6d9a8ee8c1232d8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 11 Jul 2013 17:27:28 -0600 Subject: [PATCH] Use thread_alive_p in a couple more spots --- src/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/thread.c b/src/thread.c index c7ffaced5c1..4c6b6543c84 100644 --- a/src/thread.c +++ b/src/thread.c @@ -832,7 +832,7 @@ thread_join_callback (void *arg) XSETTHREAD (thread, tstate); self->event_object = thread; self->wait_condvar = &tstate->thread_condvar; - while (tstate->m_specpdl != NULL && NILP (self->error_symbol)) + while (thread_alive_p (tstate) && NILP (self->error_symbol)) sys_cond_wait (self->wait_condvar, &global_lock); self->wait_condvar = NULL; @@ -854,7 +854,7 @@ It is an error for a thread to try to join itself. */) if (tstate == current_thread) error ("cannot join current thread"); - if (tstate->m_specpdl != NULL) + if (thread_alive_p (tstate)) flush_stack_call_func (thread_join_callback, tstate); return Qnil; -- 2.39.5