diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dosfns.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2c3075a7044..ad6463acf55 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-04-04 Eli Zaretskii <eliz@gnu.org> + + * dosfns.c (system_process_attributes) [SYSTEM_MALLOC]: Don't call + ret_lim_data. (Bug#2867) + 2009-04-03 Chong Yidong <cyd@stupidchicken.com> * term.c (produce_stretch_glyph): Reduce width of stretch glyphs diff --git a/src/dosfns.c b/src/dosfns.c index 12c260e1c63..62594f1671f 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -571,7 +571,9 @@ system_process_attributes (Lisp_Object pid) int i; Lisp_Object cmd_str, decoded_cmd, tem; double pmem; +#ifndef SYSTEM_MALLOC extern unsigned long ret_lim_data (); +#endif uid = getuid (); attrs = Fcons (Fcons (Qeuid, make_fixnum_or_float (uid)), attrs); @@ -604,8 +606,12 @@ system_process_attributes (Lisp_Object pid) make_fixnum_or_float ((unsigned long)sbrk(0)/1024)), attrs); attrs = Fcons (Fcons (Qetime, tem), attrs); +#ifndef SYSTEM_MALLOC + /* ret_lim_data is on vm-limit.c, which is not compiled in under + SYSTEM_MALLOC. */ pmem = (double)((unsigned long) sbrk (0)) / ret_lim_data () * 100.0; if (pmem > 100) +#endif pmem = 100; attrs = Fcons (Fcons (Qpmem, make_float (pmem)), attrs); /* Pass 1: Count how much storage we need. */ |