diff src/marker.c @ 5118:e0db3c197671 ben-lisp-object

merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 3742ea8250b5 d674024a8674
children 623d57b7fbe8
line wrap: on
line diff
--- a/src/marker.c	Sat Dec 26 00:20:27 2009 -0600
+++ b/src/marker.c	Sat Dec 26 21:18:49 2009 -0600
@@ -104,7 +104,7 @@
   { XD_END }
 };
 
-#ifdef MC_ALLOC
+#ifdef NEW_GC
 static void
 finalize_marker (void *header, int for_disksave)
 {
@@ -115,17 +115,17 @@
     }
 }
 
-DEFINE_BASIC_LISP_OBJECT ("marker", marker,
+DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT ("marker", marker,
 				     mark_marker, print_marker,
 				     finalize_marker,
 				     marker_equal, marker_hash,
 				     marker_description, Lisp_Marker);
-#else /* not MC_ALLOC */
-DEFINE_BASIC_LISP_OBJECT ("marker", marker,
+#else /* not NEW_GC */
+DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT ("marker", marker,
 				     mark_marker, print_marker, 0,
 				     marker_equal, marker_hash,
 				     marker_description, Lisp_Marker);
-#endif /* not MC_ALLOC */
+#endif /* not NEW_GC */
 
 /* Operations on markers. */
 
@@ -510,11 +510,11 @@
   for (m = BUF_MARKERS (b); m; m = m->next)
     total += sizeof (Lisp_Marker);
   ovstats->was_requested += total;
-#ifdef MC_ALLOC
+#ifdef NEW_GC
   overhead = mc_alloced_storage_size (total, 0);
-#else /* not MC_ALLOC */
+#else /* not NEW_GC */
   overhead = fixed_type_block_overhead (total);
-#endif /* not MC_ALLOC */
+#endif /* not NEW_GC */
   /* #### claiming this is all malloc overhead is not really right,
      but it has to go somewhere. */
   ovstats->malloc_overhead += overhead;