diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2008-05-12 08:30:13 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2008-05-12 08:30:13 +0000 |
| commit | 3e9de9f617057201c453fe4febb5e4097eaf0200 (patch) | |
| tree | b11fb9771dc56566002a29b352bb1ab14ad1afa7 | |
| parent | e76fdf5307ec8c76b2c531d3f0171a79e0afaca3 (diff) | |
| download | emacs-3e9de9f617057201c453fe4febb5e4097eaf0200.tar.gz emacs-3e9de9f617057201c453fe4febb5e4097eaf0200.tar.bz2 emacs-3e9de9f617057201c453fe4febb5e4097eaf0200.zip | |
(main_thread): Conditionalize on
FORWARD_SIGNAL_TO_MAIN_THREAD instead of HAVE_GTK_AND_PTHREAD.
(main) [FORWARD_SIGNAL_TO_MAIN_THREAD]: Initialize it.
| -rw-r--r-- | src/emacs.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 |