Mercurial > emacs
changeset 99457:439bc48615be
(get_lim_data): Fix last change.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 08 Nov 2008 14:17:22 +0000 |
| parents | 9914da365db0 |
| children | e55a0b2d069b |
| files | src/vm-limit.c |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/vm-limit.c Sat Nov 08 13:16:17 2008 +0000 +++ b/src/vm-limit.c Sat Nov 08 14:17:22 2008 +0000 @@ -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