summaryrefslogtreecommitdiff
path: root/libguile/dynwind.c
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-03-22 15:28:35 +0100
committerLudovic Courtès <ludo@gnu.org>2009-03-22 15:28:35 +0100
commitd9e59f894e1b41958203ddda7f21f4817cfcfe37 (patch)
treef0d6b0b38ed000aabf327dba4e281c37c60f92a5 /libguile/dynwind.c
parentf307fbcec2cbaaa95b8c861395133b519c7519cf (diff)
parent80540f391498ebb0f955db2fafb6a36ed03b7886 (diff)
downloadguile-d9e59f894e1b41958203ddda7f21f4817cfcfe37.tar.gz
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts: libguile/continuations.c libguile/gc-freelist.c libguile/gc-mark.c libguile/symbols.c libguile/threads.c module/ice-9/boot-9.scm
Diffstat (limited to 'libguile/dynwind.c')
-rw-r--r--libguile/dynwind.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index 39ff47f79..40f94736b 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -315,7 +315,7 @@ scm_i_dowinds (SCM to, long delta, void (*turn_func) (void *), void *data)
if (SCM_VARIABLEP (SCM_CAR (wind_key)))
scm_swap_bindings (wind_key, SCM_CDR (wind_elt));
}
- else if (SCM_TYP3 (wind_key) == scm_tc3_closure)
+ else if (scm_is_true (scm_thunk_p (wind_key)))
scm_call_0 (wind_key);
}
}
@@ -351,7 +351,7 @@ scm_i_dowinds (SCM to, long delta, void (*turn_func) (void *), void *data)
if (SCM_VARIABLEP (SCM_CAR (wind_key)))
scm_swap_bindings (wind_key, SCM_CDR (wind_elt));
}
- else if (SCM_TYP3 (wind_key) == scm_tc3_closure)
+ else if (scm_is_true (scm_thunk_p (wind_key)))
scm_call_0 (SCM_CDR (wind_elt));
}
}