[Emacs-diffs] emacs/src dosfns.c

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/04/04 09:42:12

Modified files:
        src            : dosfns.c 

Log message:
        (system_process_attributes) [SYSTEM_MALLOC]: Don't call ret_lim_data.
        (Bug#2867)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/dosfns.c?cvsroot=emacs&r1=1.53&r2=1.54

Patches:
Index: dosfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dosfns.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- dosfns.c    3 Jan 2009 15:02:30 -0000       1.53
+++ dosfns.c    4 Apr 2009 09:42:12 -0000       1.54
@@ -571,7 +571,9 @@
       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 @@
                            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.  */