Mercurial > hg > xemacs-beta
changeset 909:a703d313962d
[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.
| author | michaels |
|---|---|
| date | Tue, 09 Jul 2002 11:55:36 +0000 |
| parents | aa5bf79c0076 |
| children | 34362f9d6d61 |
| files | src/emacs.c src/ralloc.c |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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();
--- 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 */