X-Authentication-Warning: delorie.com: mail set sender to djgpp-bounces using -f X-Recipient: djgpp AT delorie DOT com Date: Sat, 04 Apr 2009 12:46:52 +0300 From: Eli Zaretskii Subject: Re: GNU Emacs 22.3 and Vista In-reply-to: X-012-Sender: halo1 AT inter DOT net DOT il To: djgpp AT delorie DOT com Message-id: <83fxgoda43.fsf@gnu.org> References: <7b67b41d-4ec9-4d49-9e15-2b2db729e8cf AT 3g2000yqk DOT googlegroups DOT com> Reply-To: djgpp AT delorie DOT com Errors-To: nobody AT delorie DOT com X-Mailing-List: djgpp AT delorie DOT com X-Unsubscribes-To: listserv AT delorie DOT com Precedence: bulk > Date: Thu, 02 Apr 2009 06:21:17 +0300 > From: Eli Zaretskii > > > P.S. It still claims an error when I try building with SYSTEM_MALLOC: > > > > msdos.o w16select.o xmenu.o termcap.o tparam.o lastfile.o > > getloadavg.o > > -lg -lm > > dosfns.o:dosfns.c:(.text+0x663): undefined reference to > > `_ret_lim_data' > > collect2: ld returned 1 exit status > > make.exe[1]: *** [temacs.exe] Error 1 > > make.exe[1]: Leaving directory `c:/Armslurp/emacs-23.0.92/src' > > make.exe: *** [src] Error 2 > > > > Now this time you have to admit that it isn't my imagination. :-) > > I will look into it. Please submit a bug report with > > M-x report-emacs-bug RET I've just fixed this in the Emacs CVS with the following change: 2009-04-04 Eli Zaretskii * dosfns.c (system_process_attributes) [SYSTEM_MALLOC]: Don't call ret_lim_data. (Bug#2867) Index: src/dosfns.c =================================================================== RCS file: /cvsroot/emacs/emacs/src/dosfns.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- src/dosfns.c 3 Jan 2009 15:02:30 -0000 1.53 +++ src/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. */