mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 01:41:01 -08:00
Code Issues Projects Releases Wiki Activity

(mallocobj): Simplify logic using auxiliary vars.

Browse source
This commit is contained in:
Richard M. Stallman 2001-11-26 10:52:40 +00:00
parent f9fa0e8aea
commit 2fa0eedfbc
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2001-11-26 Richard M. Stallman <rms@gnu.org>
* Makefile.in (mallocobj): Simplify logic using auxiliary vars.
2001-11-25 Stefan Monnier <monnier@cs.yale.edu>
* textprop.c (set_text_properties_1): Clearly mark that the

20
src/Makefile.in
View file

@ -570,19 +570,15 @@ termcapobj = tparam.o
#ifndef SYSTEM_MALLOC
#ifdef DOUG_LEA_MALLOC
#ifndef DOUG_LEA_MALLOC
gmallocobj = gmalloc.o
#endif
#ifdef REL_ALLOC
mallocobj = ralloc.o vm-limit.o
#else /* ! defined (REL_ALLOC) */
mallocobj = vm-limit.o
#endif /* ! defined (REL_ALLOC) */
#else /* ! defined (DOUG_LEA_MALLOC) */
#ifdef REL_ALLOC
mallocobj = gmalloc.o ralloc.o vm-limit.o
#else /* ! defined (REL_ALLOC) */
mallocobj = gmalloc.o vm-limit.o
#endif /* ! defined (REL_ALLOC) */
#endif /* ! defined (DOUG_LEA_MALLOC) */
rallocobj = ralloc.o
#endif
mallocobj = $(gmallocobj) $(rallocobj) vm-limit.o
#endif /* SYSTEM_MALLOC */