emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

feature/native-comp cb4c41f: * emacs.c (load_pdump): Fix compilation on


From: Eli Zaretskii
Subject: feature/native-comp cb4c41f: * emacs.c (load_pdump): Fix compilation on picky-complier platforms.
Date: Sat, 17 Apr 2021 10:29:42 -0400 (EDT)

branch: feature/native-comp
commit cb4c41f0621887172f4ababbbe65ceadb01581ec
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    * emacs.c (load_pdump): Fix compilation on picky-complier platforms.
---
 src/emacs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/emacs.c b/src/emacs.c
index d27b1c1..2fc9363 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -820,6 +820,7 @@ load_pdump (int argc, char **argv)
     NULL
 #endif
     ;
+  const char *argv0_base = "emacs";
 
   /* TODO: maybe more thoroughly scrub process environment in order to
      make this use case (loading a dump file in an unexeced emacs)
@@ -891,6 +892,7 @@ load_pdump (int argc, char **argv)
           dump_file, dump_error_to_string (result));
 
  hardcoded:
+
 #ifdef WINDOWSNT
   /* On MS-Windows, PATH_EXEC normally starts with a literal
      "%emacs_dir%", so it will never work without some tweaking.  */
@@ -900,7 +902,6 @@ load_pdump (int argc, char **argv)
   /* Look for "emacs.pdmp" in PATH_EXEC.  We hardcode "emacs" in
      "emacs.pdmp" so that the Emacs binary still works if the user
      copies and renames it.  */
-  const char *argv0_base = "emacs";
   needed = (strlen (path_exec)
            + 1
            + strlen (argv0_base)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]