projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0ceee95
)
Minor fix for unexec builds.
author
Eli Zaretskii
<eliz@gnu.org>
Thu, 7 Feb 2019 15:32:47 +0000
(17:32 +0200)
committer
Eli Zaretskii
<eliz@gnu.org>
Thu, 7 Feb 2019 15:32:47 +0000
(17:32 +0200)
* src/emacs.c (main): Fix assertions and logic for pdump
loading in builds that can both unexec and pdump.
src/emacs.c
patch
|
blob
|
history
diff --git
a/src/emacs.c
b/src/emacs.c
index 87de181725d9d5835f16558e97ec0277976ae622..3f964a16041d409974ca3ecc68d4c4abf92a769d 100644
(file)
--- a/
src/emacs.c
+++ b/
src/emacs.c
@@
-897,10
+897,13
@@
main (int argc, char **argv)
}
else
{
- eassert (!initialized);
eassert (!temacs);
+#ifndef HAVE_UNEXEC
+ eassert (!initialized);
+#endif
#ifdef HAVE_PDUMPER
- attempt_load_pdump = true;
+ if (!initialized)
+ attempt_load_pdump = true;
#endif
}