Mercurial > emacs
changeset 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 | 408c5135b0a2 |
| children | d97ebd9e30f6 |
| files | src/ChangeLog src/emacs.c src/keyboard.c |
| diffstat | 3 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Dec 07 17:38:30 2004 +0000 +++ b/src/ChangeLog Tue Dec 07 21:03:04 2004 +0000 @@ -1,5 +1,11 @@ 2004-12-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + * 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. + * alloc.c: Add comment about the reason for (UN)BLOCK_INPUT_ALLOC. 2004-12-07 Stefan <monnier@iro.umontreal.ca>
--- 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. */
--- a/src/keyboard.c Tue Dec 07 17:38:30 2004 +0000 +++ b/src/keyboard.c Tue Dec 07 21:03:04 2004 +0000 @@ -6780,7 +6780,7 @@ #ifdef BSD4_1 extern int select_alarmed; #endif -#ifdef HAVE_GTK_AND_PTHREAD +#if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD) extern pthread_t main_thread; if (pthread_self () != main_thread) { @@ -6826,7 +6826,7 @@ { /* Must preserve main program's value of errno. */ int old_errno = errno; -#ifdef HAVE_GTK_AND_PTHREAD +#if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD) extern pthread_t main_thread; if (pthread_self () != main_thread) {