(BITS_PER_CHAR, BITS_PER_INT, BITS_PER_SHORT)

[gnu-emacs] / src / syssignal.h

diff --git a/src/syssignal.h b/src/syssignal.h
index 40deead0fbeed03bba7d2d04d049aec7b7aad481..b84c402bb2ccbd8bc4590224671ef59edb19cadb 100644 (file)
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -19,7 +19,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef POSIX_SIGNALS
 
-/* Don't #include <signal.h>.  That header shouldalways be #included
+/* Don't #include <signal.h>.  That header should always be #included
    before "config.h", because some configuration files (like s/hpux.h)
    indicate that SIGIO doesn't work by #undef-ing SIGIO.  If this file
    #includes <signal.h>, then that will re-#define SIGIO and confuse
@@ -43,33 +43,40 @@ extern sigset_t empty_mask, full_mask, temp_mask;
     _mask;                                     \
   })
 #else /* ! defined (__GNUC__) */
+extern sigset_t sys_sigmask ();
 #define sigmask(SIG) (sys_sigmask (SIG))
 #endif /* ! defined (__GNUC__) */
 #endif
 
-#define sigpause(SIG)    sys_sigpause(SIG)
-#define sigblock(SIG)    sys_sigblock(SIG)
-#define sigunblock(SIG)  sys_sigunblock(SIG)
-#define sigsetmask(SIG)  sys_sigsetmask(SIG)
+#define sigpause(SIG)    sys_sigpause (SIG)
+#define sigblock(SIG)    sys_sigblock (SIG)
+#define sigunblock(SIG)  sys_sigunblock (SIG)
+#define sigsetmask(SIG)  sys_sigsetmask (SIG)
 #define sighold(SIG)     ONLY_USED_IN_BSD_4_1
 #define sigrelse(SIG)    ONLY_USED_IN_BSD_4_1
+#undef signal
+#define signal(SIG,ACT)      sys_signal(SIG,ACT)
 
 /* Whether this is what all systems want or not, this is what
-   appears to be assumed in the source, for example data.c:arith_error() */
-typedef RETSIGTYPE (*signal_handler_t) (int);
+   appears to be assumed in the source, for example data.c:arith_error.  */
+typedef RETSIGTYPE (*signal_handler_t) (/*int*/);
 
-signal_handler_t sys_signal (int signal_number, signal_handler_t action);
-int      sys_sigpause   (sigset_t new_mask);
-sigset_t sys_sigblock   (sigset_t new_mask);
-sigset_t sys_sigunblock (sigset_t new_mask);
-sigset_t sys_sigsetmask (sigset_t new_mask);
+signal_handler_t sys_signal (/*int signal_number, signal_handler_t action*/);
+int      sys_sigpause   (/*sigset_t new_mask*/);
+sigset_t sys_sigblock   (/*sigset_t new_mask*/);
+sigset_t sys_sigunblock (/*sigset_t new_mask*/);
+sigset_t sys_sigsetmask (/*sigset_t new_mask*/);
 
-#define sys_sigdel(MASK,SIG) sigdelset(&MASK,SIG)
+#define sys_sigdel(MASK,SIG) sigdelset (&MASK,SIG)
 
 #else /* ! defined (POSIX_SIGNALS) */
 #ifdef USG5_4
 
-#define sigunblock(sig) (sigprocmask(SIG_SETMASK, SIGFULLMASK & ~(sig), NULL))
+#ifndef sigblock
+#define sigblock(sig) (sigprocmask (SIG_BLOCK, SIGEMPTYMASK | sig, NULL))
+#endif
+
+#define sigunblock(sig) (sigprocmask (SIG_SETMASK, SIGFULLMASK & ~(sig), NULL))
 
 #else
 #ifdef USG
@@ -129,8 +136,12 @@ sigset_t sys_sigsetmask (sigset_t new_mask);
 #ifdef BSD
 #define EMACS_KILLPG(gid, signo) (killpg ( (gid), (signo)))
 #else
+#ifdef WINDOWSNT
+#define EMACS_KILLPG(gid, signo) (win32_kill_process (gid, signo))
+#else
 #define EMACS_KILLPG(gid, signo) (kill   (-(gid), (signo)))
 #endif
+#endif
 
 /* Define SIGCHLD as an alias for SIGCLD.  There are many conditionals
    testing SIGCHLD.  */