[Guile-commits] GNU Guile branch, master, updated. v2.1.0-814-g63b9e8b

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=63b9e8b03f6eb6c87bb8fff8efa34831a69b8952

The branch, master has been updated
       via  63b9e8b03f6eb6c87bb8fff8efa34831a69b8952 (commit)
      from  c2247b782a9234bb9aedee5204c30daf1d01a510 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 63b9e8b03f6eb6c87bb8fff8efa34831a69b8952
Author: Andy Wingo <address@hidden>
Date:   Sat Mar 22 16:06:39 2014 +0100

    Fix compile warnings
    
    * libguile/throw.c (catch): Fix bad declarations.
    
    * libguile/stackchk.c (reset_scm_stack_checking_enabled_p): Remove
      unused static function.

-----------------------------------------------------------------------

Summary of changes:
 libguile/stackchk.c |    6 ------
 libguile/throw.c    |    3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index 7e2441b..6a88c3e 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 b9a4ab5..bbde5e0 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);


hooks/post-receive
-- 
GNU Guile