From 677ad9d214da7f81feef6d78b0254b5d72f591a4 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Sun, 12 Feb 2006 22:54:29 +0000 Subject: [PATCH] (scm_eval_body): Use scm_i_dynwind_pthread_mutex_lock oinstead of scm_dynwind_pthread_mutex_lock so that it works when configured --without-threads. (SCM_APPLY, CEVAL): Likewise. Thanks to Han-Wen Nienhuys! --- libguile/ChangeLog | 7 +++++++ libguile/eval.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libguile/ChangeLog b/libguile/ChangeLog index ae43cca27..e98553e53 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,10 @@ +2006-02-13 Marius Vollmer + + * eval.c (scm_eval_body): Use scm_i_dynwind_pthread_mutex_lock + oinstead of scm_dynwind_pthread_mutex_lock so that it works when + configured --without-threads. + (SCM_APPLY, CEVAL): Likewise. Thanks to Han-Wen Nienhuys! + 2006-02-12 Marius Vollmer * unif.c (scm_dimensions_to_uniform_array): Use the prototype for diff --git a/libguile/eval.c b/libguile/eval.c index ed592af5e..5e712ec65 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -2970,7 +2970,7 @@ scm_eval_body (SCM code, SCM env) if (SCM_ISYMP (SCM_CAR (code))) { scm_dynwind_begin (0); - scm_dynwind_pthread_mutex_lock (&source_mutex); + scm_i_dynwind_pthread_mutex_lock (&source_mutex); /* check for race condition */ if (SCM_ISYMP (SCM_CAR (code))) m_expand_body (code, env); @@ -3369,7 +3369,7 @@ dispatch: if (SCM_ISYMP (form)) { scm_dynwind_begin (0); - scm_dynwind_pthread_mutex_lock (&source_mutex); + scm_i_dynwind_pthread_mutex_lock (&source_mutex); /* check for race condition */ if (SCM_ISYMP (SCM_CAR (x))) m_expand_body (x, env); @@ -4969,7 +4969,7 @@ tail: if (SCM_ISYMP (SCM_CAR (proc))) { scm_dynwind_begin (0); - scm_dynwind_pthread_mutex_lock (&source_mutex); + scm_i_dynwind_pthread_mutex_lock (&source_mutex); /* check for race condition */ if (SCM_ISYMP (SCM_CAR (proc))) m_expand_body (proc, args);