diff src/marker.c @ 3263:d674024a8674

[xemacs-hg @ 2006-02-27 16:29:00 by crestani] - Introduce a fancy asynchronous finalization strategy on C level. - Merge the code conditioned on MC_ALLOC into the code conditioned on NEW_GC. - Remove the possibility to free objects manually outside garbage collections when the new collector is enabled.
author crestani
date Mon, 27 Feb 2006 16:29:29 +0000
parents facf3239ba30
children 6ef8256a020a 19a72041c5ed e0db3c197671
line wrap: on
line diff
--- a/src/marker.c	Sun Feb 26 22:51:04 2006 +0000
+++ b/src/marker.c	Mon Feb 27 16:29:29 2006 +0000
@@ -104,7 +104,7 @@
   { XD_END }
 };
 
-#ifdef MC_ALLOC
+#ifdef NEW_GC
 static void
 finalize_marker (void *header, int for_disksave)
 {
@@ -121,13 +121,13 @@
 				     finalize_marker,
 				     marker_equal, marker_hash,
 				     marker_description, Lisp_Marker);
-#else /* not MC_ALLOC */
+#else /* not NEW_GC */
 DEFINE_BASIC_LRECORD_IMPLEMENTATION ("marker", marker,
 				     1, /*dumpable-flag*/
 				     mark_marker, print_marker, 0,
 				     marker_equal, marker_hash,
 				     marker_description, Lisp_Marker);
-#endif /* not MC_ALLOC */
+#endif /* not NEW_GC */
 
 /* Operations on markers. */
 
@@ -512,11 +512,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;