Re: broken `sigblock' defns

[Eli Zaretskii]

> Date: Thu, 01 Nov 2001 12:17:56 (GMT)
> From: "Golubev I. N." <gin@mo.msk.ru>
> 
> > What compilation failure did that cause?
> 
> emacs.c: In function `main':
> emacs.c:994: `sigprocmask_set' undeclared (first use in this function)
> emacs.c:994: (Each undeclared identifier is reported only once
> emacs.c:994: for each function it appears in.)
> gmake[1]: *** [emacs.o] Error 1

Thanks.  Please see if the changes below solve these problems.


2001-11-03  Eli Zaretskii  <eliz@is.elta.co.il>

        * s/sco5.h (sigprocmask_set): Declare as extern SIGMASKTYPE.

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

Index: src/syssignal.h
===================================================================
RCS file: /cvs/emacs/src/syssignal.h,v
retrieving revision 1.34
diff -c -r1.34 syssignal.h
*** src/syssignal.h     2000/11/11 01:07:16     1.34
--- src/syssignal.h     2001/11/03 16:49:41
***************
*** 86,104 ****
--- 86,110 ----
        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) */
Index: src/s/sco5.h
===================================================================
RCS file: /cvs/emacs/src/s/sco5.h,v
retrieving revision 1.13
diff -c -r1.13 sco5.h
*** src/s/sco5.h        2000/08/28 15:03:56     1.13
--- src/s/sco5.h        2001/11/03 16:50:09
***************
*** 127,132 ****
--- 127,133 ----
  /* SCO Unix has Posix signals, but in 3.2.5 something broken that causes
   * all keyboard-quit signals to be lost after the first one. */
  #undef POSIX_SIGNALS
+ extern SIGMASKTYPE sigprocmask_set;
  #define sigblock(sig)                                 \
       (sigprocmask_set = SIGEMPTYMASK | (sig),         \
        sigprocmask (SIG_BLOCK, &sigprocmask_set, NULL))