[CORE (21.4)] type fixes for `lim_data'

21.4 patch: ChangeLog files diff command: cvs -q diff -U 0 Files affected: src/ChangeLog Source files diff command: cvs -q diff -uN Files affected: src/mem-limits.h src/malloc.c src/emacs.c Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.290.2.83 diff -u -U0 -r1.290.2.83 ChangeLog --- src/ChangeLog 11 Jan 2005 02:02:11 -0000 1.290.2.83 +++ src/ChangeLog 12 Jan 2005 02:30:52 -0000 ＠＠ -0,0 +1,16 ＠＠ +2005-01-12 Steve Youngs <steve(a)sxemacs.org&gt; + + From Andrey Slusar <anrays(a)gmail.com&gt;: + + * emacs.c: + * malloc.c: + * mem-limits.h: + When _RLIM_T_DECLARED defined, use the rlim_t type to lim_data. + Index: src/emacs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.97.2.8 diff -u -u -r1.97.2.8 emacs.c --- src/emacs.c 13 Jun 2004 20:19:39 -0000 1.97.2.8 +++ src/emacs.c 12 Jan 2005 02:29:43 -0000 ＠＠ -344,7 +344,11 ＠＠ #endif /* Number of bytes of writable memory we can expect to be able to get */ +#ifdef _RLIM_T_DECLARED +rlim_t lim_data; +#else unsigned long lim_data; +#endif /* WARNING! Index: src/malloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/malloc.c,v retrieving revision 1.6.2.2 diff -u -u -r1.6.2.2 malloc.c --- src/malloc.c 22 Jun 2004 01:49:55 -0000 1.6.2.2 +++ src/malloc.c 12 Jan 2005 02:29:44 -0000 ＠＠ -285,7 +285,11 ＠＠ static char busy[30]; /* Number of bytes of writable memory we can expect to be able to get */ +#ifdef _RLIM_T_DECLARED +extern rlim_t lim_data; +#else extern unsigned long lim_data; +#endif /* Level number of warnings already issued. 0 -- no warnings issued. Index: src/mem-limits.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mem-limits.h,v retrieving revision 1.10.2.1 diff -u -u -r1.10.2.1 mem-limits.h --- src/mem-limits.h 13 Jun 2004 20:19:40 -0000 1.10.2.1 +++ src/mem-limits.h 12 Jan 2005 02:29:44 -0000 ＠＠ -109,7 +109,11 ＠＠ static POINTER data_space_start; /* Number of bytes of writable memory we can expect to be able to get */ +#ifdef _RLIM_T_DECLARED +extern rlim_t lim_data; +#else extern unsigned long lim_data; +#endif #if defined (HEAP_IN_DATA) && !defined(PDUMP) extern unsigned long static_heap_size; -- |---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---| | In space, | | No one can hear you rip a stinky | |------------------------------------&lt;steve(a)sxemacs.org&gt;---|