[Emacs-diffs] /srv/bzr/emacs/trunk r100898: * vm-limit.c (check_memory_limits): Fix previous change; accidentally reverted an earlier change.

[Ken Brown]

------------------------------------------------------------
revno: 100898
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Sun 2010-07-25 10:13:30 -0400
message:
  * vm-limit.c (check_memory_limits): Fix previous change; accidentally 
reverted an earlier change.
modified:
  src/ChangeLog
  src/vm-limit.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-25 13:46:48 +0000
+++ b/src/ChangeLog     2010-07-25 14:13:30 +0000
@@ -1,5 +1,10 @@
 2010-07-25  Ken Brown  <address@hidden>
 
+       * vm-limit.c (check_memory_limits): Fix previous change;
+       accidentally reverted an earlier change.
+
+2010-07-25  Ken Brown  <address@hidden>
+
        * mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead...
        * vm-limit.c: ...add 'defined (CYGWIN)' here (Bug#6715).
 

=== modified file 'src/vm-limit.c'
--- a/src/vm-limit.c    2010-07-25 13:46:48 +0000
+++ b/src/vm-limit.c    2010-07-25 14:13:30 +0000
@@ -173,9 +173,9 @@
 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;