Commit 49efed3a authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(refill_memory_reserve): Conditionalize the body, not the function's existence.

parent 8973af16
...@@ -547,6 +547,21 @@ DEFUN ("memory-full-p", Fmemory_full_p, Smemory_full_p, 0, 0, 0, ...@@ -547,6 +547,21 @@ DEFUN ("memory-full-p", Fmemory_full_p, Smemory_full_p, 0, 0, 0,
return (spare_memory ? Qnil : Qt); return (spare_memory ? Qnil : Qt);
} }
/* If we released our reserve (due to running out of memory),
and we have a fair amount free once again,
try to set aside another reserve in case we run out once more.
This is called when a relocatable block is freed in ralloc.c. */
void
refill_memory_reserve ()
{
#ifndef SYSTEM_MALLOC
if (spare_memory == 0)
spare_memory = (char *) malloc ((size_t) SPARE_MEMORY);
#endif
}
/* Called if we can't allocate relocatable space for a buffer. */ /* Called if we can't allocate relocatable space for a buffer. */
void void
...@@ -1134,20 +1149,6 @@ allocate_buffer () ...@@ -1134,20 +1149,6 @@ allocate_buffer ()
#ifndef SYSTEM_MALLOC #ifndef SYSTEM_MALLOC
/* If we released our reserve (due to running out of memory),
and we have a fair amount free once again,
try to set aside another reserve in case we run out once more.
This is called when a relocatable block is freed in ralloc.c. */
void
refill_memory_reserve ()
{
if (spare_memory == 0)
spare_memory = (char *) malloc ((size_t) SPARE_MEMORY);
}
/* Arranging to disable input signals while we're in malloc. /* Arranging to disable input signals while we're in malloc.
This only works with GNU malloc. To help out systems which can't This only works with GNU malloc. To help out systems which can't
......
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