diff options
| author | Chong Yidong | 2006-10-29 21:54:18 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-10-29 21:54:18 +0000 |
| commit | 8d31e3733083a6018045af9d7961d0bff21be6e6 (patch) | |
| tree | ad5d06e66d9b12f47106a02d9cdbd595329946a0 /src | |
| parent | afa0f40bdb27d7fe9d32bf4eb76fd3c60cbe5017 (diff) | |
| download | emacs-8d31e3733083a6018045af9d7961d0bff21be6e6.tar.gz emacs-8d31e3733083a6018045af9d7961d0bff21be6e6.zip | |
* ralloc.c (relinquish): Use a long for excess space counter to
handle 64-bit case correctly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/ralloc.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2aba406af37..27a229b0f68 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-10-29 Mark Davies <mark@mcs.vuw.ac.nz> (tiny change) | ||
| 2 | |||
| 3 | * ralloc.c (relinquish): Use a long for excess space counter to | ||
| 4 | handle 64-bit case correctly. | ||
| 5 | |||
| 1 | 2006-10-29 Jeramey Crawford <jeramey@jeramey.com> | 6 | 2006-10-29 Jeramey Crawford <jeramey@jeramey.com> |
| 2 | 7 | ||
| 3 | * m/amdx86-64.h: Add defines for OpenBSD x86-64. | 8 | * m/amdx86-64.h: Add defines for OpenBSD x86-64. |
diff --git a/src/ralloc.c b/src/ralloc.c index fea9ea5d0a8..83a26dd35d6 100644 --- a/src/ralloc.c +++ b/src/ralloc.c | |||
| @@ -330,7 +330,7 @@ static void | |||
| 330 | relinquish () | 330 | relinquish () |
| 331 | { | 331 | { |
| 332 | register heap_ptr h; | 332 | register heap_ptr h; |
| 333 | int excess = 0; | 333 | long excess = 0; |
| 334 | 334 | ||
| 335 | /* Add the amount of space beyond break_value | 335 | /* Add the amount of space beyond break_value |
| 336 | in all heaps which have extend beyond break_value at all. */ | 336 | in all heaps which have extend beyond break_value at all. */ |