diff options
| author | Eli Zaretskii | 2012-06-23 12:46:33 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-06-23 12:46:33 +0300 |
| commit | e8a022046f57aa23f605593e0ccd901da1776c5e (patch) | |
| tree | b10cf0ebc81b162b39c302e444905c78b0092ad6 /src/ralloc.c | |
| parent | 0e9e6c6abce029feda6cced84cb1fa2dc1d6d1c1 (diff) | |
| download | emacs-e8a022046f57aa23f605593e0ccd901da1776c5e.tar.gz emacs-e8a022046f57aa23f605593e0ccd901da1776c5e.zip | |
Really fix bug #11519, by fixing the last change in ralloc.c.
src/ralloc.c (r_alloc_inhibit_buffer_relocation): Fix stupid thinko
in the logic of incrementing and decrementing the value of
use_relocatable_buffers.
Diffstat (limited to 'src/ralloc.c')
| -rw-r--r-- | src/ralloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ralloc.c b/src/ralloc.c index 19d15664eec..0d8bcaf4ffb 100644 --- a/src/ralloc.c +++ b/src/ralloc.c | |||
| @@ -741,7 +741,7 @@ r_alloc_sbrk (long int size) | |||
| 741 | if (! r_alloc_initialized) | 741 | if (! r_alloc_initialized) |
| 742 | r_alloc_init (); | 742 | r_alloc_init (); |
| 743 | 743 | ||
| 744 | if (! use_relocatable_buffers) | 744 | if (use_relocatable_buffers <= 0) |
| 745 | return (*real_morecore) (size); | 745 | return (*real_morecore) (size); |
| 746 | 746 | ||
| 747 | if (size == 0) | 747 | if (size == 0) |
| @@ -1142,12 +1142,12 @@ r_alloc_reset_variable (POINTER *old, POINTER *new) | |||
| 1142 | void | 1142 | void |
| 1143 | r_alloc_inhibit_buffer_relocation (int inhibit) | 1143 | r_alloc_inhibit_buffer_relocation (int inhibit) |
| 1144 | { | 1144 | { |
| 1145 | if (use_relocatable_buffers < 0) | 1145 | if (use_relocatable_buffers > 1) |
| 1146 | use_relocatable_buffers = 0; | 1146 | use_relocatable_buffers = 1; |
| 1147 | if (inhibit) | 1147 | if (inhibit) |
| 1148 | use_relocatable_buffers++; | ||
| 1149 | else if (use_relocatable_buffers > 0) | ||
| 1150 | use_relocatable_buffers--; | 1148 | use_relocatable_buffers--; |
| 1149 | else if (use_relocatable_buffers < 1) | ||
| 1150 | use_relocatable_buffers++; | ||
| 1151 | } | 1151 | } |
| 1152 | 1152 | ||
| 1153 | 1153 | ||