aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorMiles Bader2007-01-30 22:22:43 +0000
committerMiles Bader2007-01-30 22:22:43 +0000
commitbb5b9e9dbe671b0525692acf1337efa271b33fb6 (patch)
tree810c31e2c5f1bc8e79df0cc4b121a25a9d4b8642 /src/alloc.c
parentf3df78db7218a084cbd58dc9a3cb5b9909b02d4d (diff)
parent41e49ce63ee2f9945ff99a19b00752ea887ef506 (diff)
downloademacs-bb5b9e9dbe671b0525692acf1337efa271b33fb6.tar.gz
emacs-bb5b9e9dbe671b0525692acf1337efa271b33fb6.zip
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
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c
index b6ad5545f34..c8a5a38e592 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -131,7 +131,7 @@ static pthread_mutex_t alloc_mutex;
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)
@@ -140,7 +140,7 @@ static pthread_mutex_t alloc_mutex;
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