Commit 9de7c675 authored by Paul Eggert's avatar Paul Eggert

Fix another CANNOT_DUMP problem

Reported by Robert Pluim in:
http://lists.gnu.org/archive/html/emacs-devel/2016-11/msg00468.html
* src/emacs.c (might_dump) [CANNOT_DUMP]: Move enum decl from here ...
* src/lisp.h: ... to here.
parent 209d85fe
......@@ -130,9 +130,7 @@ Lisp_Object Vlibrary_cache;
on subsequent starts. */
bool initialized;
#ifdef CANNOT_DUMP
enum { might_dump = false };
#else
#ifndef CANNOT_DUMP
/* Set to true if this instance of Emacs might dump. */
# ifndef DOUG_LEA_MALLOC
static
......
......@@ -603,8 +603,10 @@ 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. */
#ifdef DOUG_LEA_MALLOC
extern bool might_dump;
#endif
/* True means Emacs has already been initialized.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment