* eval.c (safe_setjmp): Temporarily use old setjmp until someone

has time to check why this doesn't work well with continuations.

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 4fe2a23..f02555c 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 16 11:43:49 1997  Mikael Djurfeldt  <mdj@floss.cyclic.com>
+
+       * eval.c (safe_setjmp): Temporarily use old setjmp until someone
+       has time to check why this doesn't work well with continuations.
+
 Sun Mar 16 05:09:55 1997  Jim Blandy  <jimb@totoro.cyclic.com>
 
        * Fix shell syntax error; some shells won't tolerate 

diff --git a/libguile/eval.c b/libguile/eval.c
index 01db2c4..c6c9e08 100644 (file)
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -1171,8 +1171,11 @@ scm_eval_args (l, env)
    the second condition, and making x and env volatile would be a
    speed problem, so we'll just trivially meet the first, by having no
    "automatic variables local to the function containing setjmp."  */
+/* This doesn't work well together with continuations - I haven't had
+   time to check why, so I make this temporary fix. /mdj */
+#define safe_setjmp(x) setjmp (x)
 static int
-safe_setjmp (jmp_buf env)
+unsafe_setjmp (jmp_buf env)
 {
   /* I think ANSI requires us to write the function this way, instead
      of just saying "return setjmp (env)".  Maybe I'm being silly.