Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 357:4711e16a8e49 r21-1-8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-1-8
author cvs
date Mon, 13 Aug 2007 10:57:04 +0200
parents 7c94d56991e1
children 8e84bee8ddd0
comparison
equal deleted inserted replaced
356:e85f639a32f3 357:4711e16a8e49
529 int inhibit_window_system; 529 int inhibit_window_system;
530 #ifdef NeXT 530 #ifdef NeXT
531 extern int malloc_cookie; 531 extern int malloc_cookie;
532 #endif 532 #endif
533 533
534 #if !defined(SYSTEM_MALLOC) && !defined(HAVE_LIBMCHECK) 534 #if (!defined (SYSTEM_MALLOC) && !defined (HAVE_LIBMCHECK) \
535 && !defined (DOUG_LEA_MALLOC))
535 /* Make sure that any libraries we link against haven't installed a 536 /* Make sure that any libraries we link against haven't installed a
536 hook for a gmalloc of a potentially incompatible version. */ 537 hook for a gmalloc of a potentially incompatible version. */
537 /* If we're using libmcheck, the hooks have already been initialized, */ 538 /* If we're using libmcheck, the hooks have already been initialized, */
538 /* don't touch them. -slb */ 539 /* don't touch them. -slb */
539 __malloc_hook = NULL; 540 __malloc_hook = NULL;
540 __realloc_hook = NULL; 541 __realloc_hook = NULL;
541 __free_hook = NULL; 542 __free_hook = NULL;
542 #endif /* not SYSTEM_MALLOC */ 543 #endif /* not SYSTEM_MALLOC or HAVE_LIBMCHECK or DOUG_LEA_MALLOC */
543 544
544 noninteractive = 0; 545 noninteractive = 0;
545 546
546 #ifdef NeXT 547 #ifdef NeXT
547 /* 19-Jun-1995 -baw 548 /* 19-Jun-1995 -baw