[Emacs-diffs] scratch/raeburn-startup 04ef26e 1/7: Suppress some dump-related Lea-malloc calls.

[Ken Raeburn]

branch: scratch/raeburn-startup
commit 04ef26e244ed6ec5ab86a5f72dc40c43c12bc5a2
Author: Ken Raeburn <address@hidden>
Commit: Ken Raeburn <address@hidden>

    Suppress some dump-related Lea-malloc calls.
    
    * src/lisp.h (might_dump): Always define as an enum, regardless of the
    CANNOT_DUMP setting.
    * src/emacs.c (might_dump): Never define as a variable.
    (main): Never set it.
---
 src/emacs.c | 10 ----------
 src/lisp.h  |  6 +-----
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/emacs.c b/src/emacs.c
index 19be585..95715cb 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -130,14 +130,6 @@ Lisp_Object Vlibrary_cache;
    on subsequent starts.  */
 bool initialized;
 
-#ifndef CANNOT_DUMP
-/* Set to true if this instance of Emacs might dump.  */
-# ifndef DOUG_LEA_MALLOC
-static
-# endif
-bool might_dump;
-#endif
-
 #ifdef DARWIN_OS
 extern void unexec_init_emacs_zone (void);
 #endif
@@ -713,8 +705,6 @@ main (int argc, char **argv)
     }
 
 #ifndef CANNOT_DUMP
-  might_dump = !initialized;
-
 # ifdef GNU_LINUX
   if (!initialized)
     {
diff --git a/src/lisp.h b/src/lisp.h
index b6c4668..84dafcf 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -601,12 +601,8 @@ extern void char_table_set (Lisp_Object, int, Lisp_Object);
 extern _Noreturn Lisp_Object wrong_type_argument (Lisp_Object, Lisp_Object);
 extern _Noreturn void wrong_choice (Lisp_Object, Lisp_Object);
 
-#ifdef CANNOT_DUMP
 enum { might_dump = false };
-#elif defined DOUG_LEA_MALLOC
-/* Defined in emacs.c.  */
-extern bool might_dump;
-#endif
+
 /* True means Emacs has already been initialized.
    Used during startup to detect startup of dumped Emacs.  */
 extern bool initialized;