(read_process_output): Deactivate the mark.

[bpt/emacs.git] / src / syssignal.h

diff --git a/src/syssignal.h b/src/syssignal.h
index 81d52c8..432eb16 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,60 +18,104 @@ 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 shouldalways 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)
 #define SIGFULLMASK (full_mask)
 extern sigset_t empty_mask, full_mask, temp_mask;
 
-#define sigmask(SIG) \
-(sigemptyset (&temp_mask), sigaddset (&temp_mask, SIG), temp_mask)
-
-/* May need a local mask.  There could be problems if code using any
-   of the 3 macros below could be reentered due to a signal occurring.
-   This can't happen in Emacs 18.57, so we don't worry. - DJB
-   These macros also require GCC. */
-#define sigpause(SIG)    ({ sigset_t _mask; sys_sigpause(SIG); })
-#define sigblock(SIG)    ({ sigset_t _mask; sys_sigblock(SIG); })
-#define sigunblock(SIG)  ({ sigset_t _mask; sys_sigunblock(SIG); })
-#define sigsetmask(SIG)  ({ sigset_t _mask; sys_sigsetmask(SIG); })
+/* POSIX pretty much destroys any possibility of writing sigmask as a
+   macro in standard C.  */
+#ifndef sigmask
+#ifdef __GNUC__
+#define sigmask(SIG)                           \
+  ({                                           \
+    sigset_t _mask;                            \
+    sigemptyset (&_mask);                      \
+    sigaddset (&_mask, SIG);                   \
+    _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 sighold(SIG)     ONLY_USED_IN_BSD_4_1
 #define sigrelse(SIG)    ONLY_USED_IN_BSD_4_1
 
-int (*sys_signal (int signal_number, int (*action)())) ();
-int sys_sigpause (int signal_number);
-sigset_t sys_sigblock (sigset_t new_mask);
+/* 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);
+
+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)
 
-#else /* not POSIX_SIGNALS */
+#else /* ! defined (POSIX_SIGNALS) */
+#ifdef USG5_4
+
+#define sigunblock(sig) (sigprocmask(SIG_SETMASK, SIGFULLMASK & ~(sig), NULL))
+
+#else
+#ifdef USG
+
+#define sigunblock(sig) 
+
+#else
 
 #define sigunblock(SIG) \
 { SIGMASKTYPE omask = sigblock (SIGEMPTYMASK); sigsetmask (omask & ~SIG); }
 
-#endif /* not POSIX_SIGNALS */
+#endif /* ! defined (USG) */
+#endif /* ! defined (USG5_4) */
+#endif /* ! defined (POSIX_SIGNALS) */
 
 #ifndef SIGMASKTYPE
 #define SIGMASKTYPE int
 #endif
 
 #ifndef SIGEMPTYMASK
-#define SIGEMPTYMASK 0
+#define SIGEMPTYMASK (0)
+#endif
+
+#ifndef SIGFULLMASK
+#define SIGFULLMASK (0xffffffff)
 #endif
 
 #ifndef sigmask
 #define sigmask(no) (1L << ((no) - 1))
 #endif
 
+#ifndef sigunblock
+#define sigunblock(SIG) \
+{ SIGMASKTYPE omask = sigblock (SIGFULLMASK); sigsetmask (omask & ~SIG); }
+#endif
+
+/* It would be very nice if we could somehow clean up all this trash.  */
+
 #ifndef BSD4_1
 #define sigfree() sigsetmask (SIGEMPTYMASK)
 #define sigholdx(sig) sigsetmask (sigmask (sig))
 #define sigblockx(sig) sigblock (sigmask (sig))
 #define sigunblockx(sig) sigblock (SIGEMPTYMASK)
 #define sigpausex(sig) sigpause (0)
-#endif /* not BSD4_1 */
+#endif /* BSD4_1 */
 
 #ifdef BSD4_1
 #define SIGIO SIGTINT
@@ -79,7 +123,7 @@ sigset_t sys_sigsetmask (sigset_t new_mask);
 #define sigblockx(sig) sighold (sig)
 #define sigunblockx(sig) sigrelse (sig)
 #define sigpausex(sig) sigpause (sig)
-#endif /* BSD4_1 */
+#endif /* ! defined (BSD4_1) */
 
 /* On bsd, [man says] kill does not accept a negative number to kill a pgrp.
    Must do that using the killpg call.  */
@@ -91,11 +135,10 @@ sigset_t sys_sigsetmask (sigset_t new_mask);
 
 /* Define SIGCHLD as an alias for SIGCLD.  There are many conditionals
    testing SIGCHLD.  */
-
 #ifndef VMS
 #ifdef SIGCLD
 #ifndef SIGCHLD
 #define SIGCHLD SIGCLD
-#endif /* not SIGCHLD */
-#endif /* SIGCLD */
-#endif /* not VMS */
+#endif /* SIGCHLD */
+#endif /* ! defined (SIGCLD) */
+#endif /* VMS */