Mercurial > emacs
diff src/emacs.c @ 58832:9f7c2511d457
* emacs.c (Fdump_emacs): Add ! defined (SYSTEM_MALLOC) around
reset_malloc_hooks.
* keyboard.c (handle_async_input, input_available_signal): Add
! defined (SYSTEM_MALLOC) around thread code.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 07 Dec 2004 21:03:04 +0000 |
| parents | f8cddae7d959 |
| children | 4406d551c5c6 5e454dd0d649 f2ebccfa87d4 |
line wrap: on
line diff
--- a/src/emacs.c Tue Dec 07 17:38:30 2004 +0000 +++ b/src/emacs.c Tue Dec 07 21:03:04 2004 +0000 @@ -2238,7 +2238,7 @@ memory_warnings (my_edata, malloc_warning); #endif /* not WINDOWSNT */ #endif -#ifdef HAVE_GTK_AND_PTHREAD +#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. */