Commit 06ca62eb authored by Stefan Monnier's avatar Stefan Monnier

(main, Fdump_emacs): Don't touch malloc hooks if SYNC_INPUT.

parent 2f25767f
...@@ -1023,8 +1023,10 @@ main (argc, argv ...@@ -1023,8 +1023,10 @@ main (argc, argv
Also call realloc and free for consistency. */ Also call realloc and free for consistency. */
free (realloc (malloc (4), 4)); free (realloc (malloc (4), 4));
# ifndef SYNC_INPUT
/* Arrange to disable interrupt input inside malloc etc. */ /* Arrange to disable interrupt input inside malloc etc. */
uninterrupt_malloc (); uninterrupt_malloc ();
# endif /* not SYNC_INPUT */
#endif /* not SYSTEM_MALLOC */ #endif /* not SYSTEM_MALLOC */
#if defined (MSDOS) || defined (WINDOWSNT) #if defined (MSDOS) || defined (WINDOWSNT)
...@@ -2238,7 +2240,7 @@ You must run Emacs in batch mode in order to dump it. */) ...@@ -2238,7 +2240,7 @@ You must run Emacs in batch mode in order to dump it. */)
memory_warnings (my_edata, malloc_warning); memory_warnings (my_edata, malloc_warning);
#endif /* not WINDOWSNT */ #endif /* not WINDOWSNT */
#endif #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 /* 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 loop, because pthread_self (see alloc.c) calls malloc the first time
it is called on some systems. */ it is called on some systems. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment