diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2008-11-08 14:19:03 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2008-11-08 14:19:03 +0000 |
| commit | 7cf94eac0d49c114b6051469dd334af851bcf60c (patch) | |
| tree | 0c63b44ea7c0d18a76489deb3bc50d950ecf80d9 | |
| parent | 5463218ceb256c65db72a836bbdcabf536482fb0 (diff) | |
| download | emacs-7cf94eac0d49c114b6051469dd334af851bcf60c.tar.gz | |
(get_lim_data): Fix last change.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/vm-limit.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9e81d0affd7..34c6df3c66a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-11-08 Eli Zaretskii <eliz@gnu.org> + + * vm-limit.c (get_lim_data): Fix last change. + 2008-11-08 Kenichi Handa <handa@m17n.org> * character.c (Fget_byte): New function. diff --git a/src/vm-limit.c b/src/vm-limit.c index 907732c82af..584d45f13f1 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -129,21 +129,23 @@ get_lim_data () 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 |