# HG changeset patch # User Richard M. Stallman # Date 860558491 0 # Node ID 98ab53aa2e6c7ca5a1742ed2847e55f679e1927e # Parent ceb61585d2fcede6fab81ab1abe86a7f2d7d7460 (mallocobj): Don't add gmalloc if using glibc. Drop check for `old malloc'; it isn't distributed with Emacs. diff -r ceb61585d2fc -r 98ab53aa2e6c src/Makefile.in --- 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 */