[Emacs-diffs] Changes to emacs/src/emacs.c

[Stefan Monnier]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.351 emacs/src/emacs.c:1.352
*** emacs/src/emacs.c:1.351     Tue Dec  7 21:03:04 2004
--- emacs/src/emacs.c   Sat Dec 11 21:53:33 2004
***************
*** 1023,1030 ****
--- 1023,1032 ----
       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,2244 ****
    memory_warnings (my_edata, malloc_warning);
  #endif /* not WINDOWSNT */
  #endif
! #if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD)
    /* 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.  */
--- 2240,2246 ----
    memory_warnings (my_edata, malloc_warning);
  #endif /* not WINDOWSNT */
  #endif
! #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.  */