[Guile-commits] GNU Guile branch, master, updated. release_1-9-6-117-g2051e2b

[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=2051e2bdbbafd32716e0098a71cb1f5b657a5075

The branch, master has been updated
       via  2051e2bdbbafd32716e0098a71cb1f5b657a5075 (commit)
       via  4168aa4675174ec74816ed6b7e23518c2b64c96a (commit)
       via  fdcb2b82d7a6fe917f236bdc95a7a231169fe21a (commit)
      from  7c4a6456982254440d4e145fe0b250693a11975e (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 2051e2bdbbafd32716e0098a71cb1f5b657a5075
Author: Thien-Thi Nguyen <address@hidden>
Date:   Sat Jan 9 15:12:47 2010 +0100

    Fix bug: Use correct `FUNC_NAME' for `scm_macro_binding'.
    
    * libguile/macros.c (scm_macro_binding): Use correct FUNC_NAME.
    
    Signed-off-by: Thien-Thi Nguyen <address@hidden>

commit 4168aa4675174ec74816ed6b7e23518c2b64c96a
Author: Thien-Thi Nguyen <address@hidden>
Date:   Sat Jan 9 15:06:20 2010 +0100

    Add cast in `make_vm' to silence compiler warning.
    
    * libguile/vm.c (make_vm): Add cast for .stack_base assignment.
    
    Signed-off-by: Thien-Thi Nguyen <address@hidden>

commit fdcb2b82d7a6fe917f236bdc95a7a231169fe21a
Author: Thien-Thi Nguyen <address@hidden>
Date:   Sat Jan 9 11:01:42 2010 +0100

    Fix bug: Init auto var to unrandomize `stack_depth' rv.
    
    * libguile/stacks.c (stack_depth): Init `n'.
    
    Signed-off-by: Thien-Thi Nguyen <address@hidden>

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

Summary of changes:
 libguile/macros.c |    2 +-
 libguile/stacks.c |    2 +-
 libguile/vm.c     |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libguile/macros.c b/libguile/macros.c
index edb6538..b3fea93 100644
--- a/libguile/macros.c
+++ b/libguile/macros.c
@@ -170,7 +170,7 @@ SCM_DEFINE (scm_macro_binding, "macro-binding", 1, 0, 0,
            "Return the binding of the syntax transformer @var{m}, as passed 
to\n"
             "@code{make-syntax-transformer}. If @var{m} is a primitive 
syntax\n"
             "transformer, @code{#f} will be returned.")
-#define FUNC_NAME s_scm_macro_transformer
+#define FUNC_NAME s_scm_macro_binding
 {
   SCM_VALIDATE_MACRO (1, m);
   return SCM_MACRO_BINDING (m);
diff --git a/libguile/stacks.c b/libguile/stacks.c
index 61b7be3..ce16063 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -66,7 +66,7 @@ static SCM stack_id_with_fp (SCM frame, SCM **fp);
 static long
 stack_depth (SCM frame, SCM *fp)
 {
-  long n;
+  long n = 0;
   /* count frames, skipping boot frames */
   for (; scm_is_true (frame) && SCM_VM_FRAME_FP (frame) > fp;
        frame = scm_frame_previous (frame))
diff --git a/libguile/vm.c b/libguile/vm.c
index a693c53..d6205f8 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -313,8 +313,8 @@ make_vm (void)
   vp->stack_size  = VM_DEFAULT_STACK_SIZE;
 
 #ifdef VM_ENABLE_PRECISE_STACK_GC_SCAN
-  vp->stack_base = GC_generic_malloc (vp->stack_size * sizeof (SCM),
-                                     vm_stack_gc_kind);
+  vp->stack_base = (SCM *)
+    GC_generic_malloc (vp->stack_size * sizeof (SCM), vm_stack_gc_kind);
 
   /* Keep a pointer to VP so that `vm_stack_mark ()' can know what the stack
      top is.  */


hooks/post-receive
-- 
GNU Guile