Mercurial > hg > xemacs-beta
diff src/Makefile.in.in @ 4735:80d74fed5399
Remove "old" GNU malloc in src/malloc.c, and all references to it. Drop the
GNU_MALLOC define, which was only used to distinguish between "old" and "new"
GNU malloc. See xemacs-patches message with ID
<870180fe0911061348g168f85e2m5153e2b554b94803@mail.gmail.com>.
| author | Jerry James <james@xemacs.org> |
|---|---|
| date | Mon, 09 Nov 2009 09:21:59 -0700 |
| parents | 1cecc3e9f0a0 |
| children | 5dc1b4681e33 |
line wrap: on
line diff
--- a/src/Makefile.in.in Mon Nov 09 17:05:19 2009 +0100 +++ b/src/Makefile.in.in Mon Nov 09 09:21:59 2009 -0700 @@ -305,32 +305,27 @@ malloclib = $(libmcheck) #ifndef SYSTEM_MALLOC -# ifdef GNU_MALLOC /* GNU malloc */ -# ifdef ERROR_CHECK_MALLOC -#ifdef DOUG_LEA_MALLOC +# ifdef ERROR_CHECK_MALLOC +# ifdef DOUG_LEA_MALLOC mallocobjs = free-hook.o vm-limit.o -#else +# else mallocobjs = gmalloc.o free-hook.o vm-limit.o -#endif +# endif mallocdocsrc = free-hook.c -# else /* New GNU malloc, sans error checking */ -#ifdef DOUG_LEA_MALLOC +# else /* GNU malloc, sans error checking */ +# ifdef DOUG_LEA_MALLOC mallocobjs = vm-limit.o -#else +# else mallocobjs = gmalloc.o vm-limit.o -#endif +# endif mallocdocsrc = -# endif /* ERROR_CHECK_MALLOC */ -# else /* Older GNU malloc */ -mallocobjs = malloc.o -mallocdocsrc = -# endif /* Older GNU malloc */ +# endif /* ERROR_CHECK_MALLOC */ #else /* SYSTEM_MALLOC */ mallocobjs = mallocdocsrc = -#ifdef USE_DEBUG_MALLOC +# ifdef USE_DEBUG_MALLOC malloclib = -ldmalloc -#endif /* USE_DEBUG_MALLOC */ +# endif /* USE_DEBUG_MALLOC */ #endif /* SYSTEM_MALLOC */ #ifdef HAVE_X_WINDOWS