Commit ea2acec5 authored by Richard M. Stallman's avatar Richard M. Stallman

(main): Use setrlimit only if RLIMIT_STACK.

(main) [DOUG_LEA_MALLOC]: Call r_alloc_reinit when restarting a dumped Emacs.
parent dec41418
...@@ -501,6 +501,7 @@ main (argc, argv, envp) ...@@ -501,6 +501,7 @@ main (argc, argv, envp)
{ {
malloc_set_state (malloc_state_ptr); malloc_set_state (malloc_state_ptr);
free (malloc_state_ptr); free (malloc_state_ptr);
r_alloc_reinit ();
} }
#endif #endif
...@@ -577,7 +578,7 @@ main (argc, argv, envp) ...@@ -577,7 +578,7 @@ main (argc, argv, envp)
#endif /* LINK_CRTL_SHARE */ #endif /* LINK_CRTL_SHARE */
#endif /* VMS */ #endif /* VMS */
#ifdef HAVE_SETRLIMIT #if defined (HAVE_SETRLIMIT) && defined (RLIMIT_STACK)
/* Extend the stack space available. */ /* Extend the stack space available. */
if (!getrlimit (RLIMIT_STACK, &rlim)) if (!getrlimit (RLIMIT_STACK, &rlim))
{ {
...@@ -598,7 +599,7 @@ main (argc, argv, envp) ...@@ -598,7 +599,7 @@ main (argc, argv, envp)
setrlimit (RLIMIT_STACK, &rlim); setrlimit (RLIMIT_STACK, &rlim);
} }
#endif #endif /* HAVE_SETRLIMIT and RLIMIT_STACK */
/* Record (approximately) where the stack begins. */ /* Record (approximately) where the stack begins. */
stack_bottom = &stack_bottom_variable; stack_bottom = &stack_bottom_variable;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment