summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2005-06-18 08:03:35 (GMT)
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2005-06-18 08:03:35 (GMT)
commit1ff19e0b04fbc458d87b9582223a7e60fd18ffb2 (patch)
tree8ac3c4b26d65a95323c797cb6b21916655864dd9
parente6443cf2d16a842e3dcefadbfb7be50484ee2f47 (diff)
downloadxhost-XORG-6_8_99_12.zip
xhost-XORG-6_8_99_12.tar.gz
xhost-XORG-6_8_99_12.tar.bz2
cvs: ----------------------------------------------------------------------
-rw-r--r--xhost.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/xhost.c b/xhost.c
index 71d78b3..c64918d 100644
--- a/xhost.c
+++ b/xhost.c
@@ -1,5 +1,5 @@
/* $Xorg: xhost.c,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ */
-/* $XdotOrg: xc/programs/xhost/xhost.c,v 1.2 2004/04/23 19:54:49 eich Exp $ */
+/* $XdotOrg: xc/programs/xhost/xhost.c,v 1.3 2004/07/27 06:06:06 herrb Exp $ */
/*
Copyright 1985, 1986, 1987, 1998 The Open Group
@@ -37,6 +37,10 @@ X Window System is a trademark of The Open Group.
*/
/* $XFree86: xc/programs/xhost/xhost.c,v 3.26 2003/07/27 14:05:45 herrb Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#if defined(TCPCONN) || defined(STREAMSCONN)
#define NEEDSOCKETS
#endif
@@ -124,11 +128,15 @@ static int change_host(Display *dpy, char *name, Bool add);
static 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);
#define NAMESERVER_TIMEOUT 5 /* time to wait for nameserver */