Fix compile warnings

* libguile/throw.c (catch): Fix bad declarations.

* libguile/stackchk.c (reset_scm_stack_checking_enabled_p): Remove
  unused static function.

2 files changed, 2 insertions, 7 deletions

diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index 7e2441b53..6a88c3e08 100644
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@@ -36,12 +36,6 @@
 
 int scm_stack_checking_enabled_p;
 
-static void
-reset_scm_stack_checking_enabled_p (void *arg)
-{
-  scm_stack_checking_enabled_p = (int)(scm_t_bits)arg;
-}
-
 long
 scm_stack_size (SCM_STACKITEM *start)
 {
diff --git a/libguile/throw.c b/libguile/throw.c
index b9a4ab514..bbde5e009 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -119,12 +119,13 @@ catch (SCM tag, SCM thunk, SCM handler, SCM pre_unwind_handler)
   if (SCM_I_SETJMP (registers))
     {
       /* A non-local return.  */
+      SCM args;
 
       scm_gc_after_nonlocal_exit ();
 
       /* FIXME: We know where the args will be on the stack; we could
          avoid consing them.  */
-      SCM args = scm_i_prompt_pop_abort_args_x (vp);
+      args = scm_i_prompt_pop_abort_args_x (vp);
 
       /* Cdr past the continuation. */
       args = scm_cdr (args);