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

[Jan Djärv]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.350 emacs/src/emacs.c:1.351
*** emacs/src/emacs.c:1.350     Tue Dec  7 08:25:43 2004
--- emacs/src/emacs.c   Tue Dec  7 21:03:04 2004
***************
*** 2238,2244 ****
    memory_warnings (my_edata, malloc_warning);
  #endif /* not WINDOWSNT */
  #endif
! #ifdef 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.  */
--- 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.  */