* eval.c (RETURN): Wrap in do{}while(0) in order to make it

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

diff --git a/libguile/gh_init.c b/libguile/gh_init.c
index 5b373b8..1454ef2 100644 (file)
--- a/libguile/gh_init.c
+++ b/libguile/gh_init.c
@@ -1,5 +1,5 @@
-/*      Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
-
+/* Copyright (C) 1995,1996,1997,2000,2001 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
@@ -44,7 +44,7 @@
 
 #include <stdio.h>
 
-#include <gh.h>
+#include "libguile/gh.h"
 
 typedef void (*main_prog_t) (int argc, char **argv);
 typedef void (*repl_prog_t) (int argc, char **argv);
@@ -87,14 +87,14 @@ gh_repl (int argc, char *argv[])
    error (or any thrown error if tag is SCM_BOOL_T); see
    ../libguile/throw.c for the comments explaining scm_internal_catch */
 SCM 
-gh_catch (SCM tag, scm_catch_body_t body, void *body_data,
-         scm_catch_handler_t handler, void *handler_data)
+gh_catch (SCM tag, scm_t_catch_body body, void *body_data,
+         scm_t_catch_handler handler, void *handler_data)
 {
   return scm_internal_catch (tag, body, body_data, handler, handler_data);
 }
 
 SCM 
-gh_standard_handler (void *data, SCM tag, SCM throw_args)
+gh_standard_handler (void *data SCM_UNUSED, SCM tag, SCM throw_args SCM_UNUSED)
 {
   fprintf (stderr, "\nJust got an error; tag is\n        ");
   scm_display (tag, scm_current_output_port ());