Change Guile license to LGPLv3+

[bpt/guile.git] / libguile / dynwind.c

diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index bd6a824..a45c5b5 100644 (file)
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -1,23 +1,28 @@
-/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
  */
 
 
 \f
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <assert.h>
 
 #include "libguile/_scm.h"
@@ -38,7 +43,7 @@
    #<winder>
    (enter-proc . leave-proc)     dynamic-wind
    (tag . jmpbuf)                catch
-   (tag . lazy-catch)            lazy-catch
+   (tag . pre-unwind-data)       throw-handler / lazy-catch
      tag is either a symbol or a boolean
 
 */
@@ -319,7 +324,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);
            }
        }
@@ -355,7 +360,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));
            }
        }