# HG changeset patch # User Stefan Monnier # Date 1102802013 0 # Node ID 4406d551c5c6f2bbb8bc4e4d878588736fdfbb85 # Parent c21a6318ec07e5f38930c8026aaa2887db72b126 (main, Fdump_emacs): Don't touch malloc hooks if SYNC_INPUT. diff -r c21a6318ec07 -r 4406d551c5c6 src/emacs.c --- 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. */