From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 30 Dec 2001 22:42:06 +0000 (+0000)
Subject: (sigunblock): Don't define if already defined.
X-Git-Tag: emacs-21.2~209
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4efc9f8466834eb304a710458a512832d7ce2345;p=emacs.git

(sigunblock): Don't define if already defined.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 71f2c0fc9dd..1996d61d619 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2001-12-30  Richard M. Stallman  <rms@gnu.org>
+
+	* s/sco5.h (sigprocmask_set): Conditionalize decl on ! NOT_C_CODE.
+
+2001-12-30  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* s/sco5.h (sigprocmask_set): Declare as extern SIGMASKTYPE.
+	(SIGMASKTYPE): Define.
+
+	* syssignal.h (sigunblock): Don't define if already defined.
+
 2001-12-29  Richard M. Stallman  <rms@gnu.org>
 
 	* s/sco5.h (LIBX11_SYSTEM) [MOTIF]: Add -lgen.
diff --git a/src/syssignal.h b/src/syssignal.h
index eafdb3a6a6a..2ea83b68b90 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -86,19 +86,25 @@ extern SIGMASKTYPE sigprocmask_set;
       sigprocmask (SIG_BLOCK, &sigprocmask_set, NULL))
 #endif
 
+#ifndef sigunblock
 #define sigunblock(sig)						\
      (sigprocmask_set = SIGFULLMASK & ~(sig),			\
       sigprocmask (SIG_SETMASK, &sigprocmask_set, NULL))
+#endif
 
 #else
 #ifdef USG
 
+#ifndef sigunblock
 #define sigunblock(sig) 
+#endif
 
 #else
 
+#ifndef sigunblock
 #define sigunblock(SIG) \
 { SIGMASKTYPE omask = sigblock (SIGEMPTYMASK); sigsetmask (omask & ~SIG); }
+#endif
 
 #endif /* ! defined (USG) */
 #endif /* ! defined (USG5_4) */