From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 12 May 2008 08:30:13 +0000 (+0000)
Subject: (main_thread): Conditionalize on
X-Git-Tag: emacs-pretest-22.2.90~133
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e9de9f617057201c453fe4febb5e4097eaf0200;p=emacs.git

(main_thread): Conditionalize on
FORWARD_SIGNAL_TO_MAIN_THREAD instead of HAVE_GTK_AND_PTHREAD.
(main) [FORWARD_SIGNAL_TO_MAIN_THREAD]: Initialize it.
---

diff --git a/src/emacs.c b/src/emacs.c
index 95168a39a86..7cb53a4e26a 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -353,10 +353,10 @@ int fatal_error_in_progress;
 
 void (*fatal_error_signal_hook) P_ ((void));
 
-#ifdef HAVE_GTK_AND_PTHREAD
-/* When compiled with GTK and running under Gnome, multiple threads meay be
-   created.  Keep track of our main thread to make sure signals are delivered
-   to it (see syssignal.h).  */
+#ifdef FORWARD_SIGNAL_TO_MAIN_THREAD
+/* When compiled with GTK and running under Gnome, or Carbon under Mac
+   OS X, multiple threads may be created.  Keep track of our main
+   thread to make sure signals are delivered to it (see syssignal.h).  */
 
 pthread_t main_thread;
 #endif
@@ -1031,9 +1031,9 @@ main (argc, argv
 # endif /* not SYNC_INPUT */
 #endif	/* not SYSTEM_MALLOC */
 
-#ifdef HAVE_GTK_AND_PTHREAD
+#ifdef FORWARD_SIGNAL_TO_MAIN_THREAD
   main_thread = pthread_self ();
-#endif /* HAVE_GTK_AND_PTHREAD */
+#endif /* FORWARD_SIGNAL_TO_MAIN_THREAD */
 
 #if defined (MSDOS) || defined (WINDOWSNT)
   /* We do all file input/output as binary files.  When we need to translate