[xemacs-hg @ 2005-04-10 00:47:53 by crestani] New Allocator Fixes * dumper.c (pdump_get_mc_addr): Use clearer code. * dumper.c (pdump_put_mc_addr): Use clearer code. * emacs.c (main_1): Initialize the new allocator only once. * mc-alloc.c (get_page_header): Split up the assertions to better spot the problem. * mc-alloc.c (mc_alloc_1): Move definitions of local variables to the beginning of the function.

--- a/src/emacs.c	Sat Apr 09 21:51:59 2005 +0000
+++ b/src/emacs.c	Sun Apr 10 00:47:58 2005 +0000
@@ -916,10 +916,13 @@
   if (!initialized)
 #endif
     {
-      init_mc_allocator ();
+      if (!restart)
+	{
+	  init_mc_allocator ();
 #ifdef MC_ALLOC_TYPE_STATS
-      init_lrecord_stats ();
+	  init_lrecord_stats ();
 #endif /* not MC_ALLOC_TYPE_STATS */
+	}
     }
 #endif /* MC_ALLOC */