aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Innes2000-07-05 16:32:37 +0000
committerAndrew Innes2000-07-05 16:32:37 +0000
commit968e9c040adf26740fd77c9dedacf4a513595824 (patch)
tree928ee43cd62cfe7748551d30358b1e2cdafba2c8 /src
parent321ed47b16711ddcf3f2ee5d7a6b9395c33205d8 (diff)
downloademacs-968e9c040adf26740fd77c9dedacf4a513595824.tar.gz
emacs-968e9c040adf26740fd77c9dedacf4a513595824.zip
(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.
Diffstat (limited to 'src')
-rw-r--r--src/vm-limit.c9
1 files changed, 9 insertions, 0 deletions
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) ();
50static void 50static void
51check_memory_limits () 51check_memory_limits ()
52{ 52{
53#ifdef REL_ALLOC
54 extern POINTER (*real_morecore) ();
55#endif
53 extern POINTER (*__morecore) (); 56 extern POINTER (*__morecore) ();
54 57
58
55 register POINTER cp; 59 register POINTER cp;
56 unsigned long five_percent; 60 unsigned long five_percent;
57 unsigned long data_size; 61 unsigned long data_size;
@@ -61,6 +65,11 @@ check_memory_limits ()
61 five_percent = lim_data / 20; 65 five_percent = lim_data / 20;
62 66
63 /* Find current end of memory and issue warning if getting near max */ 67 /* Find current end of memory and issue warning if getting near max */
68#ifdef REL_ALLOC
69 if (real_morecore)
70 cp = (char *) (*real_morecore) (0);
71 else
72#endif
64 cp = (char *) (*__morecore) (0); 73 cp = (char *) (*__morecore) (0);
65 data_size = (char *) cp - (char *) data_space_start; 74 data_size = (char *) cp - (char *) data_space_start;
66 75