diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/vm-limit.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 78bd22db812..f0cc70192b9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2010-07-25 Ken Brown <kbrown@cornell.edu> | 1 | 2010-07-25 Ken Brown <kbrown@cornell.edu> |
| 2 | 2 | ||
| 3 | * vm-limit.c (check_memory_limits): Fix previous change; | ||
| 4 | accidentally reverted an earlier change. | ||
| 5 | |||
| 6 | 2010-07-25 Ken Brown <kbrown@cornell.edu> | ||
| 7 | |||
| 3 | * mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead... | 8 | * mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead... |
| 4 | * vm-limit.c: ...add 'defined (CYGWIN)' here (Bug#6715). | 9 | * vm-limit.c: ...add 'defined (CYGWIN)' here (Bug#6715). |
| 5 | 10 | ||
diff --git a/src/vm-limit.c b/src/vm-limit.c index a08c300c14d..71ad82d687e 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c | |||
| @@ -173,9 +173,9 @@ static void | |||
| 173 | check_memory_limits (void) | 173 | check_memory_limits (void) |
| 174 | { | 174 | { |
| 175 | #ifdef REL_ALLOC | 175 | #ifdef REL_ALLOC |
| 176 | extern POINTER (*real_morecore) (); | 176 | extern POINTER (*real_morecore) (SIZE); |
| 177 | #endif | 177 | #endif |
| 178 | extern POINTER (*__morecore) (); | 178 | extern POINTER (*__morecore) (SIZE); |
| 179 | 179 | ||
| 180 | register POINTER cp; | 180 | register POINTER cp; |
| 181 | unsigned long five_percent; | 181 | unsigned long five_percent; |