From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sun, 27 Aug 2006 07:08:31 +0000 (+0000)
Subject: (BLOCK_INPUT_ALLOC, UNBLOCK_INPUT_ALLOC): Undo previous
X-Git-Tag: emacs-pretest-22.0.90~867
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f3c4a0e1d28dcf59bf9b59ba040b361ad44adad3;p=emacs.git

(BLOCK_INPUT_ALLOC, UNBLOCK_INPUT_ALLOC): Undo previous
change.  Move mutex lock/unlock operations inside BLOCK_INPUT.
---

diff --git a/src/alloc.c b/src/alloc.c
index 192b974196f..2fd50009649 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -130,27 +130,17 @@ static pthread_mutex_t alloc_mutex;
 #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)