diff options
| author | Eli Zaretskii | 2009-04-04 09:43:21 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2009-04-04 09:43:21 +0000 |
| commit | 693a2698d98ab6e9be65802ed29a3f911d1a69ff (patch) | |
| tree | 316b1a5d54ade766c1080003e715dfdd4bfa4412 | |
| parent | 99c87dcdb319f8e1ddd2ffea4d24e8de6e44d23c (diff) | |
| download | emacs-693a2698d98ab6e9be65802ed29a3f911d1a69ff.tar.gz emacs-693a2698d98ab6e9be65802ed29a3f911d1a69ff.zip | |
(system_process_attributes) [SYSTEM_MALLOC]: Don't call ret_lim_data.
(Bug#2867)
| -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 @@ | |||
| 1 | 2009-04-04 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * dosfns.c (system_process_attributes) [SYSTEM_MALLOC]: Don't call | ||
| 4 | ret_lim_data. (Bug#2867) | ||
| 5 | |||
| 1 | 2009-04-03 Chong Yidong <cyd@stupidchicken.com> | 6 | 2009-04-03 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * term.c (produce_stretch_glyph): Reduce width of stretch glyphs | 8 | * 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) | |||
| 571 | int i; | 571 | int i; |
| 572 | Lisp_Object cmd_str, decoded_cmd, tem; | 572 | Lisp_Object cmd_str, decoded_cmd, tem; |
| 573 | double pmem; | 573 | double pmem; |
| 574 | #ifndef SYSTEM_MALLOC | ||
| 574 | extern unsigned long ret_lim_data (); | 575 | extern unsigned long ret_lim_data (); |
| 576 | #endif | ||
| 575 | 577 | ||
| 576 | uid = getuid (); | 578 | uid = getuid (); |
| 577 | attrs = Fcons (Fcons (Qeuid, make_fixnum_or_float (uid)), attrs); | 579 | attrs = Fcons (Fcons (Qeuid, make_fixnum_or_float (uid)), attrs); |
| @@ -604,8 +606,12 @@ system_process_attributes (Lisp_Object pid) | |||
| 604 | make_fixnum_or_float ((unsigned long)sbrk(0)/1024)), | 606 | make_fixnum_or_float ((unsigned long)sbrk(0)/1024)), |
| 605 | attrs); | 607 | attrs); |
| 606 | attrs = Fcons (Fcons (Qetime, tem), attrs); | 608 | attrs = Fcons (Fcons (Qetime, tem), attrs); |
| 609 | #ifndef SYSTEM_MALLOC | ||
| 610 | /* ret_lim_data is on vm-limit.c, which is not compiled in under | ||
| 611 | SYSTEM_MALLOC. */ | ||
| 607 | pmem = (double)((unsigned long) sbrk (0)) / ret_lim_data () * 100.0; | 612 | pmem = (double)((unsigned long) sbrk (0)) / ret_lim_data () * 100.0; |
| 608 | if (pmem > 100) | 613 | if (pmem > 100) |
| 614 | #endif | ||
| 609 | pmem = 100; | 615 | pmem = 100; |
| 610 | attrs = Fcons (Fcons (Qpmem, make_float (pmem)), attrs); | 616 | attrs = Fcons (Fcons (Qpmem, make_float (pmem)), attrs); |
| 611 | /* Pass 1: Count how much storage we need. */ | 617 | /* Pass 1: Count how much storage we need. */ |