Mercurial > emacs

changeset 17349:98ab53aa2e6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(mallocobj): Don't add gmalloc if using glibc. Drop check for `old malloc'; it isn't distributed with Emacs.
author Richard M. Stallman <rms@gnu.org>
date Wed, 09 Apr 1997 04:01:31 +0000
parents ceb61585d2fc
children d8d51043c2c5
files src/Makefile.in
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.in	Wed Apr 09 04:00:39 1997 +0000
+++ b/src/Makefile.in	Wed Apr 09 04:01:31 1997 +0000
@@ -536,15 +536,19 @@
 
 #ifndef SYSTEM_MALLOC
 
-#ifdef GNU_MALLOC  /* New GNU malloc */
+#ifdef DOUG_LEA_MALLOC
+#ifdef REL_ALLOC
+mallocobj = ralloc.o vm-limit.o
+#else /* ! defined (REL_ALLOC) */
+mallocobj = 
+#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) */
-#else /* Old GNU malloc */
-mallocobj = malloc.o
-#endif /* Old GNU malloc */
+#endif /* ! defined (DOUG_LEA_MALLOC) */
 
 #endif /* SYSTEM_MALLOC */