[Emacs-diffs] master dbb1a8b: Minor fix for unexec builds.

[Eli Zaretskii]

branch: master
commit dbb1a8bc1a285c7ed8817bac533ed4a096c391ac
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Minor fix for unexec builds.
    
    * src/emacs.c (main): Fix assertions and logic for pdump
    loading in builds that can both unexec and pdump.
---
 src/emacs.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/emacs.c b/src/emacs.c
index 87de181..3f964a1 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
     }