[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/vm-limit.c,v
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/src/vm-limit.c,v |
Date: |
Sat, 08 Nov 2008 14:17:23 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 08/11/08 14:17:22
Index: vm-limit.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/vm-limit.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- vm-limit.c 24 Aug 2008 19:05:44 -0000 1.27
+++ vm-limit.c 8 Nov 2008 14:17:22 -0000 1.28
@@ -129,21 +129,23 @@
available, which causes bogus "past 95% of memory limit"
warnings. Try to overcome that via circumstantial evidence. */
lim1 = info.available_memory;
- lim2 = info.available_physical_pages * 4096;
+ lim2 = info.available_physical_pages;
/* DPMI Spec: "Fields that are unavailable will hold -1." */
if ((long)lim1 == -1L)
lim1 = 0;
if ((long)lim2 == -1L)
lim2 = 0;
+ else
+ lim2 *= 4096;
/* Surely, the available memory is at least what we have physically
available, right? */
- if (lim1 > lim2)
+ if (lim1 >= lim2)
lim_data = lim1;
else
lim_data = lim2;
/* Don't believe they will give us more that 0.5 GB. */
- if (lim_data > 512 * 1024 * 1024)
- lim_data = 512 * 1024 * 1024;
+ if (lim_data > 512U * 1024U * 1024U)
+ lim_data = 512U * 1024U * 1024U;
}
#else /* not MSDOS */
static void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/vm-limit.c,v,
Eli Zaretskii <=