The following changes consolidate some of the gui-independent

[gnu-emacs] / src / vm-limit.c

diff --git a/src/vm-limit.c b/src/vm-limit.c
index eb43e836bae62b2528b0e3d43d6fdeb5ff02226b..c0bab2e48a40cacdbe9661ebd0640efbf96eef82 100644 (file)
--- 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,13 +65,18 @@ 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;
 
   if (warn_function)
     switch (warnlevel)
       {
-      case 0: 
+      case 0:
        if (data_size > five_percent * 15)
          {
            warnlevel++;
@@ -75,7 +84,7 @@ check_memory_limits ()
          }
        break;
 
-      case 1: 
+      case 1:
        if (data_size > five_percent * 17)
          {
            warnlevel++;
@@ -83,7 +92,7 @@ check_memory_limits ()
          }
        break;
 
-      case 2: 
+      case 2:
        if (data_size > five_percent * 19)
          {
            warnlevel++;