Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Tue, 13 Dec 2011 09:20:44 +0000 (10:20 +0100)
committerAndy Wingo <wingo@pobox.com>
Tue, 13 Dec 2011 09:20:44 +0000 (10:20 +0100)
Conflicts:
configure.ac

1  2 
configure.ac
libguile/gc-malloc.c
libguile/gc.c
libguile/ports.c
module/ice-9/boot-9.scm
module/language/tree-il/peval.scm
test-suite/tests/tree-il.test

diff --cc configure.ac
@@@ -1259,7 -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_suspend_signal GC_move_disappearing_link 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])
++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_suspend_signal GC_move_disappearing_link 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
Simple merge
diff --cc libguile/gc.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge