Mercurial > emacs
comparison src/alloc.c @ 90743:f83d17e1ace6
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 615-621)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 197-199)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-166
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 30 Jan 2007 22:22:43 +0000 |
| parents | 95d0cdf160ea b176aeeb7253 |
| children | 81fa456eb1dc |
comparison
equal
deleted
inserted
replaced
| 90742:d12279146267 | 90743:f83d17e1ace6 |
|---|---|
| 129 | 129 |
| 130 #define BLOCK_INPUT_ALLOC \ | 130 #define BLOCK_INPUT_ALLOC \ |
| 131 do \ | 131 do \ |
| 132 { \ | 132 { \ |
| 133 if (pthread_equal (pthread_self (), main_thread)) \ | 133 if (pthread_equal (pthread_self (), main_thread)) \ |
| 134 sigblock (sigmask (SIGIO)); \ | 134 BLOCK_INPUT; \ |
| 135 pthread_mutex_lock (&alloc_mutex); \ | 135 pthread_mutex_lock (&alloc_mutex); \ |
| 136 } \ | 136 } \ |
| 137 while (0) | 137 while (0) |
| 138 #define UNBLOCK_INPUT_ALLOC \ | 138 #define UNBLOCK_INPUT_ALLOC \ |
| 139 do \ | 139 do \ |
| 140 { \ | 140 { \ |
| 141 pthread_mutex_unlock (&alloc_mutex); \ | 141 pthread_mutex_unlock (&alloc_mutex); \ |
| 142 if (pthread_equal (pthread_self (), main_thread)) \ | 142 if (pthread_equal (pthread_self (), main_thread)) \ |
| 143 sigunblock (sigmask (SIGIO)); \ | 143 UNBLOCK_INPUT; \ |
| 144 } \ | 144 } \ |
| 145 while (0) | 145 while (0) |
| 146 | 146 |
| 147 #else /* SYSTEM_MALLOC || not HAVE_GTK_AND_PTHREAD */ | 147 #else /* SYSTEM_MALLOC || not HAVE_GTK_AND_PTHREAD */ |
| 148 | 148 |