diff options
author | Ludovic Courtès <ludo@gnu.org> | 2008-09-09 22:03:42 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-09-09 22:03:42 +0200 |
commit | 53f4876abcebf3f05d2a88bba3a898ddcda25a74 (patch) | |
tree | 7413b4f4ab565e4784f26ee347e2a1ff46ea467e /libguile/threads.c | |
parent | 69f23174d313650ca8fb0f69ede45c48d7a26b05 (diff) | |
parent | 242ebeaf083cc43a9df18ac4436178d9b3ff66e5 (diff) | |
download | guile-53f4876abcebf3f05d2a88bba3a898ddcda25a74.tar.gz |
Merge branch 'master' into strftime-gnulib
Conflicts:
libguile/ChangeLog
srfi/ChangeLog
test-suite/ChangeLog
Diffstat (limited to 'libguile/threads.c')
-rw-r--r-- | libguile/threads.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/threads.c b/libguile/threads.c index 84c7bce7f..8699fd021 100644 --- a/libguile/threads.c +++ b/libguile/threads.c @@ -784,7 +784,7 @@ scm_with_guile (void *(*func)(void *), void *data) scm_i_default_dynamic_state); } -static void +SCM_UNUSED static void scm_leave_guile_cleanup (void *x) { scm_leave_guile (); @@ -1292,11 +1292,11 @@ fat_mutex_lock (SCM mutex, scm_t_timespec *timeout, SCM owner, int *ret) break; } } + block_self (m->waiting, mutex, &m->lock, timeout); scm_i_pthread_mutex_unlock (&m->lock); SCM_TICK; scm_i_scm_pthread_mutex_lock (&m->lock); } - block_self (m->waiting, mutex, &m->lock, timeout); } scm_i_pthread_mutex_unlock (&m->lock); return err; |