Assume signal handlers return void, as C89 requires

Drops use of autoconf's obsolete AC_TYPE_SIGNAL and the even more
obsolete Imake SIGNALRETURNSINT.

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

2 files changed, 2 insertions, 14 deletions

diff --git a/configure.ac b/configure.ac
index 1b069e8..7cf52a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,8 +17,6 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
-AC_TYPE_SIGNAL
-
 # Checks for pkg-config packages
 # - Both CFLAGS & LIBS needed:
 PKG_CHECK_MODULES(XHOST, x11 xmuu)
diff --git a/xhost.c b/xhost.c
index ae1f659..558d6da 100644
--- a/xhost.c
+++ b/xhost.c
@@ -119,17 +119,7 @@ extern int getdomainname(char *name, size_t len);
 static int change_host(Display *dpy, char *name, Bool add);
 static const char *get_hostname(XHostAddress *ha);
 static int local_xerror(Display *dpy, XErrorEvent *rep);
-
-#ifdef RETSIGTYPE /* autoconf AC_TYPE_SIGNAL */
-# define signal_t RETSIGTYPE
-#else /* Imake */
-#ifdef SIGNALRETURNSINT
-#define signal_t int
-#else
-#define signal_t void
-#endif
-#endif /* RETSIGTYPE */
-static signal_t nameserver_lost(int sig);
+static void nameserver_lost(int sig);
 
 #define NAMESERVER_TIMEOUT 5	/* time to wait for nameserver */
 
@@ -829,7 +819,7 @@ get_hostname(XHostAddress *ha)
 }
 
 /*ARGUSED*/
-static signal_t 
+static void
 nameserver_lost(int sig)
 {
     nameserver_timedout = 1;