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

[Jan Djärv]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.349 emacs/src/emacs.c:1.350
*** emacs/src/emacs.c:1.349     Tue Nov 30 00:31:09 2004
--- emacs/src/emacs.c   Tue Dec  7 08:25:43 2004
***************
*** 2238,2243 ****
--- 2238,2249 ----
    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.  */
+   reset_malloc_hooks ();
+ #endif
  #ifdef DOUG_LEA_MALLOC
    malloc_state_ptr = malloc_get_state ();
  #endif