further ecmascript work

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

diff --git a/libguile/dynwind.h b/libguile/dynwind.h
index 9aab348..dd39dae 100644 (file)
--- a/libguile/dynwind.h
+++ b/libguile/dynwind.h
@@ -3,7 +3,7 @@
 #ifndef SCM_DYNWIND_H
 #define SCM_DYNWIND_H
 
-/* Copyright (C) 1995,1996,1998,1999,2000,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,1999,2000,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
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 \f
@@ -36,34 +36,34 @@ SCM_API SCM scm_internal_dynamic_wind (scm_t_guard before,
                                       void *inner_data,
                                       void *guard_data);
 SCM_API void scm_dowinds (SCM to, long delta);
-SCM_API void scm_i_dowinds (SCM to, long delta,
-                           void (*turn_func) (void *), void *data);
-SCM_API void scm_init_dynwind (void);
+SCM_INTERNAL void scm_i_dowinds (SCM to, long delta,
+                                void (*turn_func) (void *), void *data);
+SCM_INTERNAL void scm_init_dynwind (void);
 
 SCM_API void scm_swap_bindings (SCM vars, SCM vals);
 
 typedef enum {
-  SCM_F_FRAME_REWINDABLE = (1 << 0)
-} scm_t_frame_flags;
+  SCM_F_DYNWIND_REWINDABLE = (1 << 0)
+} scm_t_dynwind_flags;
 
 typedef enum {
   SCM_F_WIND_EXPLICITLY = (1 << 0)
 } scm_t_wind_flags;
 
-SCM_API void scm_frame_begin (scm_t_frame_flags);
-SCM_API void scm_frame_end (void);
+SCM_API void scm_dynwind_begin (scm_t_dynwind_flags);
+SCM_API void scm_dynwind_end (void);
 
-SCM_API void scm_frame_unwind_handler (void (*func) (void *), void *data,
-                                      scm_t_wind_flags);
-SCM_API void scm_frame_rewind_handler (void (*func) (void *), void *data,
-                                      scm_t_wind_flags);
+SCM_API void scm_dynwind_unwind_handler (void (*func) (void *), void *data,
+                                        scm_t_wind_flags);
+SCM_API void scm_dynwind_rewind_handler (void (*func) (void *), void *data,
+                                        scm_t_wind_flags);
 
-SCM_API void scm_frame_unwind_handler_with_scm (void (*func) (SCM), SCM data,
-                                               scm_t_wind_flags);
-SCM_API void scm_frame_rewind_handler_with_scm (void (*func) (SCM), SCM data,
-                                               scm_t_wind_flags);
+SCM_API void scm_dynwind_unwind_handler_with_scm (void (*func) (SCM), SCM data,
+                                                 scm_t_wind_flags);
+SCM_API void scm_dynwind_rewind_handler_with_scm (void (*func) (SCM), SCM data,
+                                                 scm_t_wind_flags);
 
-SCM_API void scm_frame_free (void *mem);
+SCM_API void scm_dynwind_free (void *mem);
 
 #ifdef GUILE_DEBUG
 SCM_API SCM scm_wind_chain (void);