diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-02-07 17:32:47 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-02-07 17:32:47 +0200 |
| commit | dbb1a8bc1a285c7ed8817bac533ed4a096c391ac (patch) | |
| tree | c45debafcf1d81b22dc9efbf49550af7c524cc6c /src/emacs.c | |
| parent | 0ceee95f854ed9894b7077a826b00e6220932555 (diff) | |
| download | emacs-dbb1a8bc1a285c7ed8817bac533ed4a096c391ac.tar.gz | |
Minor fix for unexec builds.
* src/emacs.c (main): Fix assertions and logic for pdump
loading in builds that can both unexec and pdump.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c index 87de181725d..3f964a16041 100644 --- 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 } |