(message_dolog): Give correct args to

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

diff --git a/src/syssignal.h b/src/syssignal.h
index a7e3cde..08b989c 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,
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef POSIX_SIGNALS
 
@@ -29,11 +30,13 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define SIGEMPTYMASK (empty_mask)
 #define SIGFULLMASK (full_mask)
-extern sigset_t empty_mask, full_mask, temp_mask;
+extern sigset_t empty_mask, full_mask;
 
 /* POSIX pretty much destroys any possibility of writing sigmask as a
-   macro in standard C.  */
-#ifndef sigmask
+   macro in standard C.  We always define our own version because the
+   predefined macro in Glibc 2.1 is only provided for compatility for old
+   programs that use int as signal mask type.  */
+#undef sigmask
 #ifdef __GNUC__
 #define sigmask(SIG)                           \
   ({                                           \
@@ -48,23 +51,27 @@ extern sigset_t sys_sigmask ();
 #endif /* ! defined (__GNUC__) */
 #endif
 
-#define sigpause(SIG)    sys_sigpause (SIG)
+#undef sigpause
+#define sigpause(MASK)    sigsuspend (&(MASK))
+
 #define sigblock(SIG)    sys_sigblock (SIG)
 #define sigunblock(SIG)  sys_sigunblock (SIG)
+#ifndef sigsetmask
 #define sigsetmask(SIG)  sys_sigsetmask (SIG)
+#endif
 #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);
+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*/);
+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)
 
@@ -112,31 +119,22 @@ sigset_t sys_sigsetmask (sigset_t new_mask);
 { 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 /* BSD4_1 */
+#endif /* not BSD4_1 */
 
 #ifdef BSD4_1
 #define SIGIO SIGTINT
-/* sigfree and sigholdx are in sysdep.c */
-#define sigblockx(sig) sighold (sig)
-#define sigunblockx(sig) sigrelse (sig)
-#define sigpausex(sig) sigpause (sig)
-#endif /* ! defined (BSD4_1) */
+/* sigfree is in sysdep.c */
+#endif /* BSD4_1 */
 
 /* On bsd, [man says] kill does not accept a negative number to kill a pgrp.
    Must do that using the killpg call.  */
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #define EMACS_KILLPG(gid, signo) (killpg ( (gid), (signo)))
 #else
 #ifdef WINDOWSNT
-#define EMACS_KILLPG(gid, signo) (win32_kill_process (gid, signo))
+#define EMACS_KILLPG(gid, signo) (kill (gid, signo))
 #else
 #define EMACS_KILLPG(gid, signo) (kill   (-(gid), (signo)))
 #endif