summaryrefslogtreecommitdiff
path: root/libguile/root.c
diff options
context:
space:
mode:
authorJim Blandy <jimb@red-bean.com>1996-10-14 01:33:50 +0000
committerJim Blandy <jimb@red-bean.com>1996-10-14 01:33:50 +0000
commit1cc91f1b2937a230a2dc80dd25cc6003b7b8f2b5 (patch)
tree64ddce6a971f0e0ca6ddd41d9ac0f5b999122484 /libguile/root.c
parent1717856b4e8072b5aebab2324fcfba55bc504369 (diff)
downloadguile-1cc91f1b2937a230a2dc80dd25cc6003b7b8f2b5.tar.gz
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h, chars.c, chars.h, continuations.c, continuations.h, debug.c, debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c, eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c, filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c, gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h, hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h, kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c, markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h, objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h, ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c, procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h, root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c, simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h, stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h, strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h, struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c, unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c, version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to declare functions with prototypes. (Patch thanks to Marius Vollmer.)
Diffstat (limited to 'libguile/root.c')
-rw-r--r--libguile/root.c27
1 files changed, 4 insertions, 23 deletions
diff --git a/libguile/root.c b/libguile/root.c
index 9fb6fbd8b..5e8a5e33b 100644
--- a/libguile/root.c
+++ b/libguile/root.c
@@ -149,12 +149,12 @@ scm_make_root (parent)
return root;
}
-/* {call-with-new-root}
+/* {call-with-dynamic-root}
*
* Suspending the current thread to evaluate a thunk on the
* same C stack but under a new root.
*
- * Calls to call-with-new-root return exactly once (unless
+ * Calls to call-with-dynamic-root return exactly once (unless
* the process is somehow exitted).
*/
@@ -229,15 +229,10 @@ cwdr (proc, a1, args, handler, stack_start)
SCM_PROC(s_call_with_dynamic_root, "call-with-dynamic-root", 2, 0, 0, scm_call_with_dynamic_root);
-#ifdef __STDC__
-SCM
-scm_call_with_dynamic_root (SCM thunk, SCM handler)
-#else
SCM
scm_call_with_dynamic_root (thunk, handler)
SCM thunk;
SCM handler;
-#endif
{
SCM_STACKITEM stack_place;
@@ -245,28 +240,18 @@ scm_call_with_dynamic_root (thunk, handler)
}
SCM_PROC(s_dynamic_root, "dynamic-root", 0, 0, 0, scm_dynamic_root);
-#ifdef __STDC__
-SCM
-scm_dynamic_root (void)
-#else
SCM
scm_dynamic_root ()
-#endif
{
return scm_ulong2num (SCM_SEQ (scm_root->rootcont));
}
-#ifdef __STDC__
-SCM
-scm_apply_with_dynamic_root (SCM proc, SCM a1, SCM args, SCM handler)
-#else
SCM
scm_apply_with_dynamic_root (proc, a1, args, handler)
SCM proc;
SCM a1;
SCM args;
- SCM error;
-#endif
+ SCM handler;
{
SCM_STACKITEM stack_place;
return cwdr (proc, a1, args, handler, &stack_place);
@@ -287,16 +272,12 @@ typedef long setjmp_type;
#endif
-#ifdef __STDC__
-SCM
-scm_call_catching_errors (SCM (*thunk)(), SCM (*err_filter)(), void *closure)
-#else
+
SCM
scm_call_catching_errors (thunk, err_filter, closure)
SCM (*thunk)();
SCM (*err_filter)();
void *closure;
-#endif
{
SCM answer;
setjmp_type i;