Mercurial > hg > xemacs-beta
diff src/emacs.c @ 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 | 3a87551bfeb5 |
| children | aa5ed11f473b |
line wrap: on
line diff
--- a/src/emacs.c Mon Nov 09 17:05:19 2009 +0100 +++ b/src/emacs.c Mon Nov 09 09:21:59 2009 -0700 @@ -942,11 +942,6 @@ stderr_out ("malloc jumpstart failed!\n"); #endif /* NeXT */ - /* -#if defined (GNU_MALLOC) && \ - defined (ERROR_CHECK_MALLOC) && \ - !defined (HAVE_LIBMCHECK) - */ #if defined (LOSING_GCC_DESTRUCTOR_FREE_BUG) /* Prior to XEmacs 21, this was `#if 0'ed out. */ /* I'm enabling this because it is the only reliable way I've found to */ @@ -1729,11 +1724,6 @@ SYMS_MACHINE; #endif - /* -#if defined (GNU_MALLOC) && \ - defined (ERROR_CHECK_MALLOC) && \ - !defined (HAVE_LIBMCHECK) - */ /* Prior to XEmacs 21, this was `#if 0'ed out. -slb */ #if defined (LOSING_GCC_DESTRUCTOR_FREE_BUG) syms_of_free_hook (); @@ -3656,7 +3646,7 @@ /* The following needs conditionalization on whether either XEmacs or */ /* various system shared libraries have been built and linked with */ /* GCC >= 2.8. -slb */ -#if defined (GNU_MALLOC) +#ifndef SYSTEM_MALLOC static void voodoo_free_hook (void *UNUSED (mem)) { @@ -3669,7 +3659,7 @@ #endif voodoo_free_hook; } -#endif /* GNU_MALLOC */ +#endif /* SYSTEM_MALLOC */ DEFUN_NORETURN ("kill-emacs", Fkill_emacs, 0, 1, "P", /* Exit the XEmacs job and kill it. Ask for confirmation, without argument. @@ -3727,7 +3717,7 @@ shut_down_emacs (0, STRINGP (arg) ? arg : Qnil, 0); -#if defined (GNU_MALLOC) +#ifndef SYSTEM_MALLOC __free_hook = #if defined (TYPEOF) && !defined (UNO) /* prototype of __free_hook varies with glibc version */