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 | ecae6af979abcbb5b45c33ee05ceb297678ec9a0 (patch) | |
| tree | 44e29aca29b1f5bc76cf9f856df0286596cc5184 /src/syssignal.h | |
| parent | 131b3b112ad5405132ad5db55e0562b50477a94c (diff) | |
| parent | bb16531656a1daf7deec8a14e3a8a5fdb2c87818 (diff) | |
| download | emacs-ecae6af979abcbb5b45c33ee05ceb297678ec9a0.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1159
Diffstat (limited to 'src/syssignal.h')
| -rw-r--r-- | src/syssignal.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/syssignal.h b/src/syssignal.h index 53877ca107d..0ab4598b507 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -21,8 +21,14 @@ Boston, MA 02110-1301, USA. */ extern void init_signals P_ ((void)); -#ifdef HAVE_GTK_AND_PTHREAD +#if defined (HAVE_GTK_AND_PTHREAD) || (defined (HAVE_CARBON) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1020) #include <pthread.h> +/* If defined, asynchronous signals delivered to a non-main thread are + forwarded to the main thread. */ +#define FORWARD_SIGNAL_TO_MAIN_THREAD +#endif + +#ifdef FORWARD_SIGNAL_TO_MAIN_THREAD extern pthread_t main_thread; #endif @@ -208,7 +214,7 @@ extern SIGMASKTYPE sigprocmask_set; char *strsignal (); #endif -#ifdef HAVE_GTK_AND_PTHREAD +#ifdef FORWARD_SIGNAL_TO_MAIN_THREAD #define SIGNAL_THREAD_CHECK(signo) \ do { \ if (!pthread_equal (pthread_self (), main_thread)) \ @@ -227,8 +233,8 @@ char *strsignal (); } \ } while (0) -#else /* not HAVE_GTK_AND_PTHREAD */ +#else /* not FORWARD_SIGNAL_TO_MAIN_THREAD */ #define SIGNAL_THREAD_CHECK(signo) -#endif /* not HAVE_GTK_AND_PTHREAD */ +#endif /* not FORWARD_SIGNAL_TO_MAIN_THREAD */ /* arch-tag: 4580e86a-340d-4574-9e11-a742b6e1a152 (do not change this comment) */ |