procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix another CANNOT_DUMP problem

Browse source 
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.
This commit is contained in:
Paul Eggert 2016-11-21 08:42:12 -08:00
parent 209d85fe56
commit 9de7c6752b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/emacs.c
View file

@ -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

4
src/lisp.h
View file

@ -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.