1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-18 01:30:27 +02:00

Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
	libguile/validate.h
This commit is contained in:
Mark H Weaver 2012-11-05 15:57:03 -05:00
commit fd57bbf5ac
4 changed files with 12 additions and 12 deletions

View file

@ -697,10 +697,11 @@ do_thread_exit (void *v)
scm_i_pthread_mutex_lock (&m->lock);
/* Since MUTEX is in `t->mutexes', T must be its owner. */
assert (scm_is_eq (m->owner, t->handle));
unblock_from_queue (m->waiting);
/* Check whether T owns MUTEX. This is usually the case, unless
T abandoned MUTEX; in that case, T is no longer its owner (see
`fat_mutex_lock') but MUTEX is still in `t->mutexes'. */
if (scm_is_eq (m->owner, t->handle))
unblock_from_queue (m->waiting);
scm_i_pthread_mutex_unlock (&m->lock);
}