mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-20 21:11:18 -07:00
Code Issues Projects Releases Wiki Activity

(system_process_attributes) [SYSTEM_MALLOC]: Don't call ret_lim_data.

Browse source 
(Bug#2867)
This commit is contained in:
Eli Zaretskii 2009-04-04 09:43:21 +00:00
parent 99c87dcdb3
commit 693a2698d9
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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

6
src/dosfns.c
View file

@ -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. */