Mercurial > emacs
diff src/syssignal.h @ 94959:d2b202fafd8c
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1159
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 14 May 2008 04:28:51 +0000 |
| parents | 107ccd98fa12 32bd922619ad |
| children | 29adfc9354e7 |
line wrap: on
line diff
--- a/src/syssignal.h Wed May 14 01:58:43 2008 +0000 +++ b/src/syssignal.h Wed May 14 04:28:51 2008 +0000 @@ -21,8 +21,14 @@ 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 @@ 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 @@ } \ } 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) */