summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/ChangeLog6
-rw-r--r--libguile/gc-card.c2
-rw-r--r--libguile/gc-segment.c2
-rw-r--r--test-suite/ChangeLog5
-rw-r--r--test-suite/standalone/Makefile.am2
5 files changed, 15 insertions, 2 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index a1cde56ea..42438fdc5 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-25 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ * gc-segment.c: add comment
+
2003-04-07 Rob Browning <rlb@defaultvalue.org>
* debug.h: change "id" arg name to "info_id" to avoid objective-c
@@ -22,6 +26,7 @@
cause trouble when included via objective-c (can't hurt, might
help). Still have usage in debug.h, though.
+>>>>>>> 1.1807
2003-04-06 Mikael Djurfeldt <djurfeldt@nada.kth.se>
* random.c (scm_c_random_bignum): Don't generate a random number
@@ -581,6 +586,7 @@
(modinclude_HEADERS): remove version.h.
(nodist_modinclude_HEADERS): add version.h.
+>>>>>>> 1.1805
2003-02-24 Mikael Djurfeldt <djurfeldt@nada.kth.se>
This fixes a serious GC bug, introduced during the latest
diff --git a/libguile/gc-card.c b/libguile/gc-card.c
index f94b55929..9525416d7 100644
--- a/libguile/gc-card.c
+++ b/libguile/gc-card.c
@@ -94,7 +94,7 @@ scm_i_sweep_card (scm_t_cell * p, SCM *free_list, scm_t_heap_segment*seg)
/*
I tried something fancy with shifting by one bit every word from
- the bitvec in turn, but it wasn't any faster, but quite bit
+ the bitvec in turn, but it wasn't any faster, but quite a bit
hairier.
*/
for (p += offset; p < end; p += span, offset += span)
diff --git a/libguile/gc-segment.c b/libguile/gc-segment.c
index 9028ae847..332624deb 100644
--- a/libguile/gc-segment.c
+++ b/libguile/gc-segment.c
@@ -128,6 +128,8 @@ scm_i_clear_segment_mark_space (scm_t_heap_segment *seg)
}
/*
+ Sweep cards from SEG until we've gather THRESHOLD cells
+
RETURN:
Freelist.
diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index 512a41ac7..66e091651 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-09 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ * standalone/Makefile.am (snarfcppopts): use DEFAULT_INCLUDES
+ instead of INCLUDES
+
2003-04-07 Rob Browning <rlb@defaultvalue.org>
* Makefile.am (SUBDIRS): add standalone.
diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am
index dfac9278e..f4ed769b3 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -13,7 +13,7 @@ test_cflags := \
-I$(top_srcdir) \
-I$(top_srcdir)/libguile-ltdl
-snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+snarfcppopts = $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(CFLAGS)
%.c.x: %.c
${top_builddir}/libguile/guile-snarf -o $@ $< $(snarfcppopts)