diff options
| author | Mark H Weaver <mhw@netris.org> | 2013-03-28 05:09:53 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2013-03-28 05:09:53 -0400 |
| commit | 26d148066f9cb20e395a7dc4fefdf2e2ef0b2fb0 (patch) | |
| tree | 40f13bc6355adb822bb8cd01fee5bcd9fd5430f9 /libguile/debug.c | |
| parent | 8ae26afefee947c71314733c419519fb616bf36d (diff) | |
| parent | 579127cce488ce208d62e68e679e34fbbdc17367 (diff) | |
| download | guile-26d148066f9cb20e395a7dc4fefdf2e2ef0b2fb0.tar.gz | |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
configure.ac
libguile/deprecated.c
libguile/deprecated.h
libguile/filesys.h
libguile/fluids.c
libguile/fports.c
libguile/gc.c
libguile/guile.c
libguile/numbers.c
libguile/objcodes.c
libguile/r6rs-ports.c
libguile/smob.c
libguile/socket.c
libguile/threads.h
module/language/scheme/decompile-tree-il.scm
module/language/tree-il/peval.scm
test-suite/tests/syncase.test
Diffstat (limited to 'libguile/debug.c')
| -rw-r--r-- | libguile/debug.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libguile/debug.c b/libguile/debug.c index 87513bf48..b01864fb8 100644 --- a/libguile/debug.c +++ b/libguile/debug.c @@ -202,10 +202,14 @@ SCM_DEFINE (scm_debug_hang, "debug-hang", 0, 1, 0, SCM scm_local_eval (SCM exp, SCM env) { - static SCM local_eval_var = SCM_BOOL_F; + static SCM local_eval_var = SCM_UNDEFINED; + static scm_i_pthread_mutex_t local_eval_var_mutex + = SCM_I_PTHREAD_MUTEX_INITIALIZER; - if (scm_is_false (local_eval_var)) + scm_i_scm_pthread_mutex_lock (&local_eval_var_mutex); + if (SCM_UNBNDP (local_eval_var)) local_eval_var = scm_c_public_variable ("ice-9 local-eval", "local-eval"); + scm_i_pthread_mutex_unlock (&local_eval_var_mutex); return scm_call_2 (SCM_VARIABLE_REF (local_eval_var), exp, env); } |