# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1266807669 21600
# Node ID e7b120e28b4927b6371d6744daede5a4df6e76a5
# Parent  86041556214b3fddd8ceb504089f0bd1008db027# Parent  24372c7e0e8f5c6b8612a3c3d198b582b44ce4c0
merge

diff -r 86041556214b -r e7b120e28b49 src/ChangeLog
--- a/src/ChangeLog	Sun Feb 21 21:00:09 2010 -0600
+++ b/src/ChangeLog	Sun Feb 21 21:01:09 2010 -0600
@@ -54,6 +54,12 @@
 
 2010-02-21  Ben Wing  <ben@xemacs.org>
 
+	* gc.c (kkcc_marking): Fix compile error.
+	* mc-alloc.c:
+	#if 0 out some unused functions.
+
+2010-02-21  Ben Wing  <ben@xemacs.org>
+
 	* extents.c (process_extents_for_insertion_mapper):
 	Assertion wasn't quite set up correctly in previous patch.
 
diff -r 86041556214b -r e7b120e28b49 src/gc.c
--- a/src/gc.c	Sun Feb 21 21:00:09 2010 -0600
+++ b/src/gc.c	Sun Feb 21 21:01:09 2010 -0600
@@ -1022,7 +1022,7 @@
    on the kkcc_gc_stack. This function processes all elements on the stack
    according to their descriptions. */
 static void
-kkcc_marking (USED_IF_NEW_GC (cnt))
+kkcc_marking (int USED_IF_NEW_GC (cnt))
 {
   kkcc_gc_stack_entry *stack_entry = 0;
   void *data = 0;
diff -r 86041556214b -r e7b120e28b49 src/mc-alloc.c
--- a/src/mc-alloc.c	Sun Feb 21 21:00:09 2010 -0600
+++ b/src/mc-alloc.c	Sun Feb 21 21:01:09 2010 -0600
@@ -1782,6 +1782,8 @@
 
 /*--- incremental garbage collector ----------------------------------*/
 
+#if 0 /* currently unused */
+
 /* access dirty bit of page header */
 static void
 set_dirty_bit (page_header *ph, unsigned int value)
@@ -1841,6 +1843,8 @@
   return PH_HEAP_SPACE (get_page_header (ptr));
 }
 
+#endif /* 0 */
+
 /* Make PAGE_SIZE globally available. */
 EMACS_INT
 mc_get_page_size ()