# HG changeset patch
# User michaels
# Date 1026215736 0
# Node ID a703d313962d168ded617e68f874293b6571c08f
# Parent  aa5bf79c0076cf407655407e61a93d12339ce5c9
[xemacs-hg @ 2002-07-09 11:55:35 by michaels]
2002-07-08  Mike Sperber <mike@xemacs.org>

	* ralloc.c (init_ralloc): Allocate properly for pdump.

	* emacs.c (main_1): Revert init_ralloc patch in favor of an
	easier-to-understand solution.

diff -r aa5bf79c0076 -r a703d313962d src/emacs.c
--- a/src/emacs.c	Tue Jul 09 09:37:01 2002 +0000
+++ b/src/emacs.c	Tue Jul 09 11:55:36 2002 +0000
@@ -789,9 +789,6 @@
 #if defined (HAVE_MMAP) && defined (REL_ALLOC)
   /* ralloc can only be used if using the GNU memory allocator. */
   init_ralloc ();
-#ifdef PDUMP
-  init_ralloc ();
-#endif
 #elif defined (REL_ALLOC) && !defined(DOUG_LEA_MALLOC)
   if (initialized)
     init_ralloc();
diff -r aa5bf79c0076 -r a703d313962d src/ralloc.c
--- a/src/ralloc.c	Tue Jul 09 09:37:01 2002 +0000
+++ b/src/ralloc.c	Tue Jul 09 11:55:36 2002 +0000
@@ -2022,6 +2022,10 @@
   if (r_alloc_initialized > 1)
     return;	/* used to return 1 */
 
+#ifdef PDUMP
+  /* Under pdump, we need to activate ralloc on the first go. */
+  ++r_alloc_initialized;
+#endif
   if (++r_alloc_initialized == 1)
     return;	/* used to return 1 */