Some changes from Michael K. Johnson for Linux.

	* sysdep.c (sys_siglist): Don't define this if HAVE_SYS_SIGLIST is
	#defined.  That lets the system provide it, if it has it.
	* syssignal.h (sigmask): Only define this if <signal.h> hasn't
	given us a definition already.
	* syssignal.h (sys_sigpause): Fix argument in prototype.
	* sysdep.c (init_signals): The masks are called empty_mask and
	full_mask, not signal_empty_mask and signal_full_mask.
	(signal_handler_t): Moved ....
	* syssignal.h: ... to here.
	* systty.h (EMACS_SET_TTY_PGRP): Call tcsetpgrp with the correct
	arguments.
	* emacs.c (main): Don't try to establish signal handlers for
	SIGBUS and SIGSYS unless they're actually #defined.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/sysdep.c b/src/sysdep.c
index a6c1bdfbb34..99df6865338 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2040,14 +2040,10 @@ static struct sigaction new_action, old_action;
 
 init_signals ()
 {
-#ifdef POSIX_SIGNALS
-  sigemptyset (&signal_empty_mask);
-  sigfillset (&signal_full_mask);
-#endif
+  sigemptyset (&empty_mask);
+  sigfillset (&full_mask);
 }
 
-int (*signal_handler_t) ();
-
 signal_handler_t
 sys_signal (int signal_number, signal_handler_t action)
 {
@@ -2417,6 +2413,7 @@ sys_write (fildes, buf, nbyte)
  *      always negligible.   Fred Fish, Unisoft Systems Inc.
  */
 
+#ifndef HAVE_SYS_SIGLIST
 char *sys_siglist[NSIG + 1] =
 {
 #ifdef AIX
@@ -2477,6 +2474,7 @@ char *sys_siglist[NSIG + 1] =
 #endif /* not AIX */
   0
   };
+#endif HAVE_SYS_SIGLIST
 
 /*
  *      Warning, this function may not duplicate 4.2 action properly