aboutsummaryrefslogtreecommitdiffstats
path: root/src/emacs.c
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>1997-07-12 07:07:26 +0000
committerRichard M. Stallman <[email protected]>1997-07-12 07:07:26 +0000
commitea2acec55b169b4978569fcdbd4c0b70256df313 (patch)
tree4223da0afa31be5bd7d01d8106b5d86d7ad2b6b3 /src/emacs.c
parentdec414188f5a04db0ac23ba29515de0a1f3ed4b8 (diff)
(main): Use setrlimit only if RLIMIT_STACK.
(main) [DOUG_LEA_MALLOC]: Call r_alloc_reinit when restarting a dumped Emacs.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 43f8d27b3e..bf701f8666 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -501,6 +501,7 @@ main (argc, argv, envp)
{
malloc_set_state (malloc_state_ptr);
free (malloc_state_ptr);
+ r_alloc_reinit ();
}
#endif
@@ -577,7 +578,7 @@ main (argc, argv, envp)
#endif /* LINK_CRTL_SHARE */
#endif /* VMS */
-#ifdef HAVE_SETRLIMIT
+#if defined (HAVE_SETRLIMIT) && defined (RLIMIT_STACK)
/* Extend the stack space available. */
if (!getrlimit (RLIMIT_STACK, &rlim))
{
@@ -598,7 +599,7 @@ main (argc, argv, envp)
setrlimit (RLIMIT_STACK, &rlim);
}
-#endif
+#endif /* HAVE_SETRLIMIT and RLIMIT_STACK */
/* Record (approximately) where the stack begins. */
stack_bottom = &stack_bottom_variable;