From: Ken Brown Date: Sun, 25 Jul 2010 14:13:30 +0000 (-0400) Subject: * vm-limit.c (check_memory_limits): Fix previous change; accidentally reverted an... X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~49^2~136^2~4 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63f9a672cbb01aa1a4eaf67dacd6d04b47c4ea1d;p=emacs.git * vm-limit.c (check_memory_limits): Fix previous change; accidentally reverted an earlier change. --- diff --git a/src/ChangeLog b/src/ChangeLog index 78bd22db812..f0cc70192b9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-07-25 Ken Brown + + * vm-limit.c (check_memory_limits): Fix previous change; + accidentally reverted an earlier change. + 2010-07-25 Ken Brown * mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead... 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 check_memory_limits (void) { #ifdef REL_ALLOC - extern POINTER (*real_morecore) (); + extern POINTER (*real_morecore) (SIZE); #endif - extern POINTER (*__morecore) (); + extern POINTER (*__morecore) (SIZE); register POINTER cp; unsigned long five_percent;