(Vdefault_properties): New vbl.

[gnu-emacs] / src / syssignal.h

diff --git a/src/syssignal.h b/src/syssignal.h
index dddaee8092439dfa3c8ba9b5b2dfae660d9226c5..433b0b9d2f4e6010e58a2fd30795153bcbb5f67c 100644 (file)
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -1,5 +1,5 @@
 /* syssignal.h - System-dependent definitions for signals.
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright (C) 1993 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -18,6 +18,13 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef POSIX_SIGNALS
+
+/* 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
+   things.  */
+
 #define SIGMASKTYPE sigset_t
 
 #define SIGEMPTYMASK (empty_mask)
@@ -26,6 +33,7 @@ extern sigset_t empty_mask, full_mask, temp_mask;
 
 /* POSIX pretty much destroys any possibility of writing sigmask as a
    macro in standard C.  */
+#ifndef sigmask
 #ifdef __GNUC__
 #define sigmask(SIG)                           \
   ({                                           \
@@ -35,28 +43,39 @@ 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
+#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*/);
 
-int (*sys_signal (int signal_number, int (*action)())) ();
-int sys_sigpause (int signal_number);
-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
@@ -116,8 +135,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.  */