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

diff --git a/src/ChangeLog b/src/ChangeLog
index 71f2c0fc9ddc3ffb2d5d34760b4279765a4cd776..1996d61d619cb0e87d702429878fd91cb005e295 100644 (file)
--- 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 eafdb3a6a6a442816cddaacd1dab33601e4e85cb..2ea83b68b902d414e280f43975e0d1b9f6e88e1e 100644 (file)
--- 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) */