Mercurial > emacs
comparison src/keyboard.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 | cf6107ab7096 5e454dd0d649 f2ebccfa87d4 |
comparison
equal
deleted
inserted
replaced
58831:408c5135b0a2 | 58832:9f7c2511d457 |
---|---|
6778 handle_async_input () | 6778 handle_async_input () |
6779 { | 6779 { |
6780 #ifdef BSD4_1 | 6780 #ifdef BSD4_1 |
6781 extern int select_alarmed; | 6781 extern int select_alarmed; |
6782 #endif | 6782 #endif |
6783 #ifdef HAVE_GTK_AND_PTHREAD | 6783 #if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD) |
6784 extern pthread_t main_thread; | 6784 extern pthread_t main_thread; |
6785 if (pthread_self () != main_thread) | 6785 if (pthread_self () != main_thread) |
6786 { | 6786 { |
6787 /* POSIX says any thread can receive the signal. On GNU/Linux that is | 6787 /* POSIX says any thread can receive the signal. On GNU/Linux that is |
6788 not true, but for other systems (FreeBSD at least) it is. So direct | 6788 not true, but for other systems (FreeBSD at least) it is. So direct |
6824 input_available_signal (signo) | 6824 input_available_signal (signo) |
6825 int signo; | 6825 int signo; |
6826 { | 6826 { |
6827 /* Must preserve main program's value of errno. */ | 6827 /* Must preserve main program's value of errno. */ |
6828 int old_errno = errno; | 6828 int old_errno = errno; |
6829 #ifdef HAVE_GTK_AND_PTHREAD | 6829 #if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD) |
6830 extern pthread_t main_thread; | 6830 extern pthread_t main_thread; |
6831 if (pthread_self () != main_thread) | 6831 if (pthread_self () != main_thread) |
6832 { | 6832 { |
6833 /* POSIX says any thread can receive the signal. On GNU/Linux that is | 6833 /* POSIX says any thread can receive the signal. On GNU/Linux that is |
6834 not true, but for other systems (FreeBSD at least) it is. So direct | 6834 not true, but for other systems (FreeBSD at least) it is. So direct |