diff options
| author | Richard M. Stallman | 2005-10-04 20:26:13 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-10-04 20:26:13 +0000 |
| commit | 49efed3a0f168480c7adea79bd879242be2039f8 (patch) | |
| tree | 4ffd821014b145898dbbd563e8400e623b87cfb5 /src | |
| parent | 8973af1616ec68dd14afeddb057a6e729db7045c (diff) | |
| download | emacs-49efed3a0f168480c7adea79bd879242be2039f8.tar.gz emacs-49efed3a0f168480c7adea79bd879242be2039f8.zip | |
(refill_memory_reserve): Conditionalize the body, not the function's existence.
Diffstat (limited to 'src')
| -rw-r--r-- | src/alloc.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/alloc.c b/src/alloc.c index ccf4afff9f8..54533ff351a 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -547,6 +547,21 @@ DEFUN ("memory-full-p", Fmemory_full_p, Smemory_full_p, 0, 0, 0, | |||
| 547 | return (spare_memory ? Qnil : Qt); | 547 | return (spare_memory ? Qnil : Qt); |
| 548 | } | 548 | } |
| 549 | 549 | ||
| 550 | /* If we released our reserve (due to running out of memory), | ||
| 551 | and we have a fair amount free once again, | ||
| 552 | try to set aside another reserve in case we run out once more. | ||
| 553 | |||
| 554 | This is called when a relocatable block is freed in ralloc.c. */ | ||
| 555 | |||
| 556 | void | ||
| 557 | refill_memory_reserve () | ||
| 558 | { | ||
| 559 | #ifndef SYSTEM_MALLOC | ||
| 560 | if (spare_memory == 0) | ||
| 561 | spare_memory = (char *) malloc ((size_t) SPARE_MEMORY); | ||
| 562 | #endif | ||
| 563 | } | ||
| 564 | |||
| 550 | /* Called if we can't allocate relocatable space for a buffer. */ | 565 | /* Called if we can't allocate relocatable space for a buffer. */ |
| 551 | 566 | ||
| 552 | void | 567 | void |
| @@ -1134,20 +1149,6 @@ allocate_buffer () | |||
| 1134 | 1149 | ||
| 1135 | #ifndef SYSTEM_MALLOC | 1150 | #ifndef SYSTEM_MALLOC |
| 1136 | 1151 | ||
| 1137 | /* If we released our reserve (due to running out of memory), | ||
| 1138 | and we have a fair amount free once again, | ||
| 1139 | try to set aside another reserve in case we run out once more. | ||
| 1140 | |||
| 1141 | This is called when a relocatable block is freed in ralloc.c. */ | ||
| 1142 | |||
| 1143 | void | ||
| 1144 | refill_memory_reserve () | ||
| 1145 | { | ||
| 1146 | if (spare_memory == 0) | ||
| 1147 | spare_memory = (char *) malloc ((size_t) SPARE_MEMORY); | ||
| 1148 | } | ||
| 1149 | |||
| 1150 | |||
| 1151 | /* Arranging to disable input signals while we're in malloc. | 1152 | /* Arranging to disable input signals while we're in malloc. |
| 1152 | 1153 | ||
| 1153 | This only works with GNU malloc. To help out systems which can't | 1154 | This only works with GNU malloc. To help out systems which can't |