Assume signal handlers return void, as C89 requires

Drops use of autoconf's obsolete AC_TYPE_SIGNAL & RETSIGTYPE

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

7 files changed, 19 insertions, 24 deletions

diff --git a/configure.ac b/configure.ac
index f0ea150..9c3662e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,9 +95,6 @@ AC_CHECK_DECL(key_setnet,
 #include <rpc/key_prot.h>
 ])
 
-# Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_SIGNAL
-
 # Check for system library functions
 # Required system libraries have been searched for and are listed in $LIBS
 AC_FUNC_FORK
diff --git a/include/dm.h b/include/dm.h
index cd60f4b..2d670a0 100644
--- a/include/dm.h
+++ b/include/dm.h
@@ -501,8 +501,6 @@ extern void ProcessRequestSocket(int fd);
 
 # include <stdlib.h>
 
-# define SIGVAL RETSIGTYPE
-
 # if defined(X_NOT_POSIX) || defined(__UNIXOS2__) || defined(__NetBSD__) && defined(__sparc__)
 #  if defined(SYSV) || defined(__UNIXOS2__)
 #   define SIGNALS_RESET_WHEN_CAUGHT
@@ -517,8 +515,8 @@ extern void ProcessRequestSocket(int fd);
 #  define Jmp_buf		sigjmp_buf
 # endif
 
-typedef SIGVAL (*SIGFUNC)(int);
+typedef void (*SIGFUNC)(int);
 
-SIGVAL (*Signal(int, SIGFUNC Handler))(int);
+void (*Signal(int, SIGFUNC Handler))(int);
 
 #endif /* _DM_H_ */
diff --git a/xdm/dm.c b/xdm/dm.c
index 9d79261..cb81386 100644
--- a/xdm/dm.c
+++ b/xdm/dm.c
@@ -90,7 +90,7 @@ from The Open Group.
 extern FILE    *fdopen();
 #endif
 
-static SIGVAL	StopAll (int n), RescanNotify (int n);
+static void	StopAll (int n), RescanNotify (int n);
 static void	RescanServers (void);
 static void	RestartDisplay (struct display *d, int forceReserver);
 static void	ScanServers (void);
@@ -110,7 +110,7 @@ static int TitleLen;
 #endif
 
 #ifndef UNRELIABLE_SIGNALS
-static SIGVAL ChildNotify (int n);
+static void ChildNotify (int n);
 #endif
 
 static long StorePid (void);
@@ -237,7 +237,7 @@ main (int argc, char **argv)
 }
 
 /* ARGSUSED */
-static SIGVAL
+static void
 RescanNotify (int n)
 {
     int olderrno = errno;
@@ -381,7 +381,7 @@ RescanIfMod (void)
  */
 
 /* ARGSUSED */
-static SIGVAL
+static void
 StopAll (int n)
 {
     int olderrno = errno;
@@ -424,7 +424,7 @@ int	ChildReady;
 
 #ifndef UNRELIABLE_SIGNALS
 /* ARGSUSED */
-static SIGVAL
+static void
 ChildNotify (int n)
 {
     int olderrno = errno;
diff --git a/xdm/reset.c b/xdm/reset.c
index a1b0504..fc6ba94 100644
--- a/xdm/reset.c
+++ b/xdm/reset.c
@@ -76,7 +76,7 @@ killWindows (Display *dpy, Window window)
 static Jmp_buf	resetJmp;
 
 /* ARGSUSED */
-static SIGVAL
+static void
 abortReset (int n)
 {
 	Longjmp (resetJmp, 1);
diff --git a/xdm/server.c b/xdm/server.c
index c5c6ae9..dcb85c6 100644
--- a/xdm/server.c
+++ b/xdm/server.c
@@ -49,7 +49,7 @@ static int receivedUsr1;
 static int serverPause (unsigned t, pid_t serverPid);
 
 /* ARGSUSED */
-static SIGVAL
+static void
 CatchUsr1 (int n)
 {
     int olderrno = errno;
@@ -149,14 +149,14 @@ static Jmp_buf	pauseAbort;
 static int	serverPauseRet;
 
 /* ARGSUSED */
-static SIGVAL
+static void
 serverPauseAbort (int n)
 {
     Longjmp (pauseAbort, 1);
 }
 
 /* ARGSUSED */
-static SIGVAL
+static void
 serverPauseUsr1 (int n)
 {
     Debug ("display manager paused til SIGUSR1\n");
@@ -231,7 +231,7 @@ serverPause (unsigned t, pid_t serverPid)
 static Jmp_buf	openAbort;
 
 /* ARGSUSED */
-static SIGVAL
+static void
 abortOpen (int n)
 {
 	Longjmp (openAbort, 1);
@@ -339,7 +339,7 @@ PingLostIOErr (Display *dpy)
 }
 
 /* ARGSUSED */
-static SIGVAL
+static void
 PingLostSig (int n)
 {
     PingLost();
@@ -349,7 +349,7 @@ int
 PingServer (struct display *d, Display *alternateDpy)
 {
     int	    (*oldError)(Display *);
-    SIGVAL  (*oldSig)(int);
+    void  (*oldSig)(int);
     int	    oldAlarm;
     static Display *aDpy;
 
diff --git a/xdm/session.c b/xdm/session.c
index 573747d..84c58d7 100644
--- a/xdm/session.c
+++ b/xdm/session.c
@@ -226,7 +226,7 @@ static struct verify_info	verify;
 static Jmp_buf	abortSession;
 
 /* ARGSUSED */
-static SIGVAL
+static void
 catchTerm (int n)
 {
     Longjmp (abortSession, 1);
@@ -235,7 +235,7 @@ catchTerm (int n)
 static Jmp_buf	pingTime;
 
 /* ARGSUSED */
-static SIGVAL
+static void
 catchAlrm (int n)
 {
     Longjmp (pingTime, 1);
@@ -244,7 +244,7 @@ catchAlrm (int n)
 static Jmp_buf	tenaciousClient;
 
 /* ARGSUSED */
-static SIGVAL
+static void
 waitAbort (int n)
 {
 	Longjmp (tenaciousClient, 1);
@@ -466,7 +466,7 @@ DeleteXloginResources (struct display *d, Display *dpy)
 static Jmp_buf syncJump;
 
 /* ARGSUSED */
-static SIGVAL
+static void
 syncTimeout (int n)
 {
     Longjmp (syncJump, 1);
diff --git a/xdm/util.c b/xdm/util.c
index 60aab21..2e2cdd7 100644
--- a/xdm/util.c
+++ b/xdm/util.c
@@ -295,7 +295,7 @@ localHostname (void)
     return localHostbuf;
 }
 
-SIGVAL (*Signal (int sig, SIGFUNC handler))(int)
+void (*Signal (int sig, SIGFUNC handler))(int)
 {
 #ifdef HAVE_SIGACTION
     struct sigaction sigact, osigact;