diff options
| author | YAMAMOTO Mitsuharu | 2008-05-12 08:30:13 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2008-05-12 08:30:13 +0000 |
| commit | 3e9de9f617057201c453fe4febb5e4097eaf0200 (patch) | |
| tree | b11fb9771dc56566002a29b352bb1ab14ad1afa7 /src | |
| parent | e76fdf5307ec8c76b2c531d3f0171a79e0afaca3 (diff) | |
| download | emacs-3e9de9f617057201c453fe4febb5e4097eaf0200.tar.gz 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.
Diffstat (limited to 'src')
| -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; | |||
| 353 | 353 | ||
| 354 | void (*fatal_error_signal_hook) P_ ((void)); | 354 | void (*fatal_error_signal_hook) P_ ((void)); |
| 355 | 355 | ||
| 356 | #ifdef HAVE_GTK_AND_PTHREAD | 356 | #ifdef FORWARD_SIGNAL_TO_MAIN_THREAD |
| 357 | /* When compiled with GTK and running under Gnome, multiple threads meay be | 357 | /* When compiled with GTK and running under Gnome, or Carbon under Mac |
| 358 | created. Keep track of our main thread to make sure signals are delivered | 358 | OS X, multiple threads may be created. Keep track of our main |
| 359 | to it (see syssignal.h). */ | 359 | thread to make sure signals are delivered to it (see syssignal.h). */ |
| 360 | 360 | ||
| 361 | pthread_t main_thread; | 361 | pthread_t main_thread; |
| 362 | #endif | 362 | #endif |
| @@ -1031,9 +1031,9 @@ main (argc, argv | |||
| 1031 | # endif /* not SYNC_INPUT */ | 1031 | # endif /* not SYNC_INPUT */ |
| 1032 | #endif /* not SYSTEM_MALLOC */ | 1032 | #endif /* not SYSTEM_MALLOC */ |
| 1033 | 1033 | ||
| 1034 | #ifdef HAVE_GTK_AND_PTHREAD | 1034 | #ifdef FORWARD_SIGNAL_TO_MAIN_THREAD |
| 1035 | main_thread = pthread_self (); | 1035 | main_thread = pthread_self (); |
| 1036 | #endif /* HAVE_GTK_AND_PTHREAD */ | 1036 | #endif /* FORWARD_SIGNAL_TO_MAIN_THREAD */ |
| 1037 | 1037 | ||
| 1038 | #if defined (MSDOS) || defined (WINDOWSNT) | 1038 | #if defined (MSDOS) || defined (WINDOWSNT) |
| 1039 | /* We do all file input/output as binary files. When we need to translate | 1039 | /* We do all file input/output as binary files. When we need to translate |