summaryrefslogtreecommitdiff
path: root/xhost.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-02-23 08:38:57 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-02-23 08:38:57 -0800
commita3f0c2a060f30259dc3830ea8165be15f2aeae75 (patch)
tree16db77ddd9ac9aff8f1f702478c7807814b5b404 /xhost.c
parent3911e16aa570ca0709b50727c82df421f1401bd7 (diff)
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>
Diffstat (limited to 'xhost.c')
-rw-r--r--xhost.c14
1 files changed, 2 insertions, 12 deletions
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;