diff options
| author | Miles Bader <miles@gnu.org> | 2008-05-14 04:28:51 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-05-14 04:28:51 +0000 |
| commit | a85a9b1b4ae804cee7bd2ce3ea5803b10167457c (patch) | |
| tree | 32844ae4b09858aaeeca235776719cfcda69eb72 /src/emacs.c | |
| parent | 2a840ea90643a8b8dcb9b3951a59e3063f54e5f4 (diff) | |
| parent | 1ddbb436a3156be26c378865bb0cfd2654b7b001 (diff) | |
| download | emacs-a85a9b1b4ae804cee7bd2ce3ea5803b10167457c.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1159
Diffstat (limited to 'src/emacs.c')
| -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 7074076cf66..c401afafbd7 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -355,10 +355,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 may 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 @@ -1035,9 +1035,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 |