[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.3-62-g4eb2861

[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=4eb286127c41e67eb90ef1b69f61f613bcd830b2

The branch, stable-2.0 has been updated
       via  4eb286127c41e67eb90ef1b69f61f613bcd830b2 (commit)
      from  e7b2efd582a6146cd9e9c82a905b3e87bb86d046 (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 4eb286127c41e67eb90ef1b69f61f613bcd830b2
Author: Chris K. Jester-Young <address@hidden>
Date:   Thu Dec 8 21:13:30 2011 +0100

    fix compilation with gc 7.1
    
    * configure.ac: Add checks for GC_gcollect_and_unmap and
      GC_get_unmapped_bytes.
    * libguile/gc-malloc.c (scm_realloc): GC_gcollect() if we don't have
      GC_gcollect_and_unmap.
    * libguile/gc.c (GC_get_heap_usage_safe): Likewise, don't
      GC_get_unmapped_bytes if the function doesn't exist.

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

Summary of changes:
 configure.ac         |    2 +-
 libguile/gc-malloc.c |    4 ++++
 libguile/gc.c        |    4 ++++
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index d63dd63..0cfe961 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1259,7 +1259,7 @@ save_LIBS="$LIBS"
 LIBS="$BDW_GC_LIBS $LIBS"
 CFLAGS="$BDW_GC_CFLAGS $CFLAGS"
 
-AC_CHECK_FUNCS([GC_do_blocking GC_call_with_gc_active GC_pthread_exit 
GC_pthread_cancel GC_allow_register_threads GC_pthread_sigmask 
GC_set_start_callback GC_get_heap_usage_safe GC_get_free_space_divisor])
+AC_CHECK_FUNCS([GC_do_blocking GC_call_with_gc_active GC_pthread_exit 
GC_pthread_cancel GC_allow_register_threads GC_pthread_sigmask 
GC_set_start_callback GC_get_heap_usage_safe GC_get_free_space_divisor 
GC_gcollect_and_unmap GC_get_unmapped_bytes])
 
 # Though the `GC_do_blocking ()' symbol is present in GC 7.1, it is not
 # declared, and has a different type (returning void instead of
diff --git a/libguile/gc-malloc.c b/libguile/gc-malloc.c
index 72142ca..b7781f3 100644
--- a/libguile/gc-malloc.c
+++ b/libguile/gc-malloc.c
@@ -96,7 +96,11 @@ scm_realloc (void *mem, size_t size)
     return ptr;
 
   /* Time is hard: trigger a full, ``stop-the-world'' GC, and try again.  */
+#ifdef HAVE_GC_GCOLLECT_AND_UNMAP
   GC_gcollect_and_unmap ();
+#else
+  GC_gcollect ();
+#endif
 
   SCM_SYSCALL (ptr = realloc (mem, size));
   if (ptr)
diff --git a/libguile/gc.c b/libguile/gc.c
index ff1ebe6..0ab27a5 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -205,7 +205,11 @@ GC_get_heap_usage_safe (GC_word *pheap_size, GC_word 
*pfree_bytes,
 {
   *pheap_size = GC_get_heap_size ();
   *pfree_bytes = GC_get_free_bytes ();
+#ifdef HAVE_GC_GET_UNMAPPED_BYTES
   *punmapped_bytes = GC_get_unmapped_bytes ();
+#else
+  *punmapped_bytes = 0;
+#endif
   *pbytes_since_gc = GC_get_bytes_since_gc ();
   *ptotal_bytes = GC_get_total_bytes ();
 }


hooks/post-receive
-- 
GNU Guile