aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-02-07 17:27:18 +0200
committerEli Zaretskii2019-02-07 17:27:18 +0200
commit0ceee95f854ed9894b7077a826b00e6220932555 (patch)
tree9a3a94d6d73c5c56a696e471e6a63a970e24cc6d /src
parent005d8346b8cc9ca7675890f085ce34c56ab2723a (diff)
downloademacs-0ceee95f854ed9894b7077a826b00e6220932555.tar.gz
emacs-0ceee95f854ed9894b7077a826b00e6220932555.zip
; Simplify last change.
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/emacs.c b/src/emacs.c
index c5163db95a7..87de181725d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -913,7 +913,7 @@ main (int argc, char **argv)
913 /* Grab our malloc arena space now, before anything important 913 /* Grab our malloc arena space now, before anything important
914 happens. This relies on the static heap being needed only in 914 happens. This relies on the static heap being needed only in
915 temacs and only if we are going to dump with unexec. */ 915 temacs and only if we are going to dump with unexec. */
916 bool use_dynamic_heap = false; 916 bool use_dynamic_heap = true;
917 if (temacs) 917 if (temacs)
918 { 918 {
919 char *temacs_str = NULL, *p; 919 char *temacs_str = NULL, *p;
@@ -929,11 +929,7 @@ main (int argc, char **argv)
929 will not do their job. */ 929 will not do their job. */
930 use_dynamic_heap = will_dump_with_pdumper_p (); 930 use_dynamic_heap = will_dump_with_pdumper_p ();
931 } 931 }
932 else
933 use_dynamic_heap = true;
934 } 932 }
935 else
936 use_dynamic_heap = true;
937 init_heap (use_dynamic_heap); 933 init_heap (use_dynamic_heap);
938 /* Set global variables used to detect Windows version. Do this as 934 /* Set global variables used to detect Windows version. Do this as
939 early as possible. (w32proc.c calls this function as well, but 935 early as possible. (w32proc.c calls this function as well, but