aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2021-04-17 17:29:17 +0300
committerEli Zaretskii2021-04-17 17:29:17 +0300
commitcb4c41f0621887172f4ababbbe65ceadb01581ec (patch)
tree4ac8e7244a164a8fb2c72d62035c252d608e641f /src
parent9aa5203b542f0c9ea7d074c6cfde2a28b466f5d1 (diff)
downloademacs-cb4c41f0621887172f4ababbbe65ceadb01581ec.tar.gz
emacs-cb4c41f0621887172f4ababbbe65ceadb01581ec.zip
* emacs.c (load_pdump): Fix compilation on picky-complier platforms.
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c
index d27b1c1351d..2fc93631c9e 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -820,6 +820,7 @@ load_pdump (int argc, char **argv)
820 NULL 820 NULL
821#endif 821#endif
822 ; 822 ;
823 const char *argv0_base = "emacs";
823 824
824 /* TODO: maybe more thoroughly scrub process environment in order to 825 /* TODO: maybe more thoroughly scrub process environment in order to
825 make this use case (loading a dump file in an unexeced emacs) 826 make this use case (loading a dump file in an unexeced emacs)
@@ -891,6 +892,7 @@ load_pdump (int argc, char **argv)
891 dump_file, dump_error_to_string (result)); 892 dump_file, dump_error_to_string (result));
892 893
893 hardcoded: 894 hardcoded:
895
894#ifdef WINDOWSNT 896#ifdef WINDOWSNT
895 /* On MS-Windows, PATH_EXEC normally starts with a literal 897 /* On MS-Windows, PATH_EXEC normally starts with a literal
896 "%emacs_dir%", so it will never work without some tweaking. */ 898 "%emacs_dir%", so it will never work without some tweaking. */
@@ -900,7 +902,6 @@ load_pdump (int argc, char **argv)
900 /* Look for "emacs.pdmp" in PATH_EXEC. We hardcode "emacs" in 902 /* Look for "emacs.pdmp" in PATH_EXEC. We hardcode "emacs" in
901 "emacs.pdmp" so that the Emacs binary still works if the user 903 "emacs.pdmp" so that the Emacs binary still works if the user
902 copies and renames it. */ 904 copies and renames it. */
903 const char *argv0_base = "emacs";
904 needed = (strlen (path_exec) 905 needed = (strlen (path_exec)
905 + 1 906 + 1
906 + strlen (argv0_base) 907 + strlen (argv0_base)