From: Andrew Innes <andrewi@gnu.org>
Date: Wed, 5 Jul 2000 16:32:37 +0000 (+0000)
Subject: (check_memory_limits) [REL_ALLOC]: Use real_morecore
X-Git-Tag: emacs-pretest-21.0.90~2963
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=968e9c040adf26740fd77c9dedacf4a513595824;p=emacs.git

(check_memory_limits) [REL_ALLOC]: Use real_morecore
when non-NULL instead of __morecore, to take account of buffer
memory.  This also solves a problem with spurious memory warnings
on Windows.
---

diff --git a/src/vm-limit.c b/src/vm-limit.c
index eb43e836bae..721e740bd02 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -50,8 +50,12 @@ static void (*warn_function) ();
 static void
 check_memory_limits ()
 {
+#ifdef REL_ALLOC
+  extern POINTER (*real_morecore) ();
+#endif
   extern POINTER (*__morecore) ();
 
+
   register POINTER cp;
   unsigned long five_percent;
   unsigned long data_size;
@@ -61,6 +65,11 @@ check_memory_limits ()
   five_percent = lim_data / 20;
 
   /* Find current end of memory and issue warning if getting near max */
+#ifdef REL_ALLOC
+  if (real_morecore)
+    cp = (char *) (*real_morecore) (0);
+  else
+#endif
   cp = (char *) (*__morecore) (0);
   data_size = (char *) cp - (char *) data_space_start;