diff options
| author | Kenichi Handa | 2012-09-30 23:39:46 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-09-30 23:39:46 +0900 |
| commit | c194970e15b6d6efa07697679a25dfab3aa76442 (patch) | |
| tree | 49aec8be9d2dcc74ad3c81f562e48308d8e27b75 /src/ralloc.c | |
| parent | 95402d5faa114a311cabfb8c64cf22a93787a066 (diff) | |
| parent | dd946752ab8810149a66a3eff469eb128709972d (diff) | |
| download | emacs-c194970e15b6d6efa07697679a25dfab3aa76442.tar.gz emacs-c194970e15b6d6efa07697679a25dfab3aa76442.zip | |
merge trunk
Diffstat (limited to 'src/ralloc.c')
| -rw-r--r-- | src/ralloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ralloc.c b/src/ralloc.c index 9a4b1ada229..ab91baae5b5 100644 --- a/src/ralloc.c +++ b/src/ralloc.c | |||
| @@ -1199,9 +1199,9 @@ r_alloc_init (void) | |||
| 1199 | #endif | 1199 | #endif |
| 1200 | 1200 | ||
| 1201 | #ifdef DOUG_LEA_MALLOC | 1201 | #ifdef DOUG_LEA_MALLOC |
| 1202 | BLOCK_INPUT; | 1202 | block_input (); |
| 1203 | mallopt (M_TOP_PAD, 64 * 4096); | 1203 | mallopt (M_TOP_PAD, 64 * 4096); |
| 1204 | UNBLOCK_INPUT; | 1204 | unblock_input (); |
| 1205 | #else | 1205 | #else |
| 1206 | #ifndef SYSTEM_MALLOC | 1206 | #ifndef SYSTEM_MALLOC |
| 1207 | /* Give GNU malloc's morecore some hysteresis so that we move all | 1207 | /* Give GNU malloc's morecore some hysteresis so that we move all |