aboutsummaryrefslogtreecommitdiffstats
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorJan Djärv2004-12-07 21:03:04 +0000
committerJan Djärv2004-12-07 21:03:04 +0000
commitcf435f39ceb1d6c59d314068e02203b6477f1c2a (patch)
tree3e3c677fbaa4518c21b00859886e8b4b0a9e98a8 /src/keyboard.c
parentf415cacdbd53833dff84f8666dcbcb7035fb9320 (diff)
downloademacs-cf435f39ceb1d6c59d314068e02203b6477f1c2a.tar.gz
emacs-cf435f39ceb1d6c59d314068e02203b6477f1c2a.zip
* 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.
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 3cfc1652084..19973edf33d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6780,7 +6780,7 @@ handle_async_input ()
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 {
@@ -6826,7 +6826,7 @@ input_available_signal (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 {