diff options
| author | Jan Djärv <[email protected]> | 2004-12-07 21:03:04 +0000 |
|---|---|---|
| committer | Jan Djärv <[email protected]> | 2004-12-07 21:03:04 +0000 |
| commit | cf435f39ceb1d6c59d314068e02203b6477f1c2a (patch) | |
| tree | 3e3c677fbaa4518c21b00859886e8b4b0a9e98a8 | |
| parent | f415cacdbd53833dff84f8666dcbcb7035fb9320 (diff) | |
* 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.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/emacs.c | 2 | ||||
| -rw-r--r-- | src/keyboard.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6b3a832e84..28030aef0e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2004-12-07 Jan Dj,Ad(Brv <[email protected]> + * 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 <[email protected]> diff --git a/src/emacs.c b/src/emacs.c index b6b7f986e9..8e2443e8f1 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2238,7 +2238,7 @@ You must run Emacs in batch mode in order to dump it. */) 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. */ diff --git a/src/keyboard.c b/src/keyboard.c index 3cfc165208..19973edf33 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -6780,7 +6780,7 @@ handle_async_input () #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 @@ input_available_signal (signo) { /* 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) { |