Mercurial > hg > xemacs-beta

diff src/emacs.c @ 257:65c19d2020f7 r20-5b27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b27
author cvs
date Mon, 13 Aug 2007 10:22:03 +0200
parents 084402c475ba
children 11cf20601dec
line wrap: on
line diff
--- a/src/emacs.c	Mon Aug 13 10:21:19 2007 +0200
+++ b/src/emacs.c	Mon Aug 13 10:22:03 2007 +0200
@@ -67,11 +67,11 @@
 
 extern void memory_warnings (void *, void (*warnfun) (CONST char *));
 
-#ifndef SYSTEM_MALLOC
+#if !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC
 extern void *(*__malloc_hook)(size_t);
 extern void *(*__realloc_hook)(void *, size_t);
 extern void (*__free_hook)(void *);
-#endif  /* not SYSTEM_MALLOC */
+#endif  /* not SYSTEM_MALLOC && not DOUG_LEA_MALLOC */
 
 /* Command line args from shell, as list of strings */
 Lisp_Object Vcommand_line_args;