aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/emacs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 8e2443e8f1f..9fde3a6ed42 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1023,8 +1023,10 @@ main (argc, argv
1023 Also call realloc and free for consistency. */ 1023 Also call realloc and free for consistency. */
1024 free (realloc (malloc (4), 4)); 1024 free (realloc (malloc (4), 4));
1025 1025
1026# ifndef SYNC_INPUT
1026 /* Arrange to disable interrupt input inside malloc etc. */ 1027 /* Arrange to disable interrupt input inside malloc etc. */
1027 uninterrupt_malloc (); 1028 uninterrupt_malloc ();
1029# endif /* not SYNC_INPUT */
1028#endif /* not SYSTEM_MALLOC */ 1030#endif /* not SYSTEM_MALLOC */
1029 1031
1030#if defined (MSDOS) || defined (WINDOWSNT) 1032#if defined (MSDOS) || defined (WINDOWSNT)
@@ -2238,7 +2240,7 @@ You must run Emacs in batch mode in order to dump it. */)
2238 memory_warnings (my_edata, malloc_warning); 2240 memory_warnings (my_edata, malloc_warning);
2239#endif /* not WINDOWSNT */ 2241#endif /* not WINDOWSNT */
2240#endif 2242#endif
2241#if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD) 2243#if !defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD) && !defined SYNC_INPUT
2242 /* Pthread may call malloc before main, and then we will get an endless 2244 /* Pthread may call malloc before main, and then we will get an endless
2243 loop, because pthread_self (see alloc.c) calls malloc the first time 2245 loop, because pthread_self (see alloc.c) calls malloc the first time
2244 it is called on some systems. */ 2246 it is called on some systems. */