Mercurial > emacs
diff src/alloc.c @ 90596:6823a91487f2
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 399-413)
- Update from CVS
- Rcirc update from Ryan Yeske
- Merge from gnus--rel--5.10
- Miscellaneous tq-related fixes.
* gnus--rel--5.10 (patch 126-127)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-105
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 28 Aug 2006 04:33:45 +0000 |
parents | 7f3f771c85fa 07b45e10e844 |
children | dbe3f29e61d6 |
line wrap: on
line diff
--- a/src/alloc.c Mon Aug 28 04:25:23 2006 +0000 +++ b/src/alloc.c Mon Aug 28 04:33:45 2006 +0000 @@ -130,27 +130,17 @@ #define BLOCK_INPUT_ALLOC \ do \ { \ - if (!in_sighandler) \ - { \ - pthread_mutex_lock (&alloc_mutex); \ - if (pthread_self () == main_thread) \ - BLOCK_INPUT; \ - else \ - sigblock (sigmask (SIGIO)); \ - } \ + if (pthread_self () == main_thread) \ + BLOCK_INPUT; \ + pthread_mutex_lock (&alloc_mutex); \ } \ while (0) #define UNBLOCK_INPUT_ALLOC \ do \ { \ - if (!in_sighandler) \ - { \ - pthread_mutex_unlock (&alloc_mutex); \ - if (pthread_self () == main_thread) \ - UNBLOCK_INPUT; \ - else \ - sigunblock (sigmask (SIGIO)); \ - } \ + pthread_mutex_unlock (&alloc_mutex); \ + if (pthread_self () == main_thread) \ + UNBLOCK_INPUT; \ } \ while (0)