Mercurial > emacs
diff src/emacs.c @ 58895:4406d551c5c6
(main, Fdump_emacs): Don't touch malloc hooks if SYNC_INPUT.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sat, 11 Dec 2004 21:53:33 +0000 |
parents | 9f7c2511d457 |
children | 59945307b86b fb79180b618d |
line wrap: on
line diff
--- a/src/emacs.c Sat Dec 11 21:12:45 2004 +0000 +++ b/src/emacs.c Sat Dec 11 21:53:33 2004 +0000 @@ -1023,8 +1023,10 @@ Also call realloc and free for consistency. */ free (realloc (malloc (4), 4)); +# ifndef SYNC_INPUT /* Arrange to disable interrupt input inside malloc etc. */ uninterrupt_malloc (); +# endif /* not SYNC_INPUT */ #endif /* not SYSTEM_MALLOC */ #if defined (MSDOS) || defined (WINDOWSNT) @@ -2238,7 +2240,7 @@ memory_warnings (my_edata, malloc_warning); #endif /* not WINDOWSNT */ #endif -#if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD) +#if !defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD) && !defined SYNC_INPUT /* Pthread may call malloc before main, and then we will get an endless loop, because pthread_self (see alloc.c) calls malloc the first time it is called on some systems. */