Add config.h includes for modularization Use RETSIGTYPE if defined byXORG-6_8_99_901XORG-6_8_99_900

    autoconf in addition to Imake's SIGNALRETURNSINT.

1 files changed, 15 insertions, 6 deletions

diff --git a/gethost.c b/gethost.c
index fa511c1..15f38dc 100644
--- a/gethost.c
+++ b/gethost.c
@@ -1,5 +1,6 @@
 /*
  * $Xorg: gethost.c,v 1.5 2001/02/09 02:05:38 xorgcvs Exp $
+ * $XdotOrg: $
  * 
 Copyright 1989, 1998  The Open Group
 
@@ -28,6 +29,10 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/programs/xauth/gethost.c,v 3.20 2003/07/27 12:34:25 herrb Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* sorry, streams support does not really work yet */
 #if defined(STREAMSCONN) && defined(SVR4)
 #undef STREAMSCONN
@@ -87,13 +92,17 @@ static volatile Bool nameserver_timedout = False;
  * be found.  Stolen from xhost.
  */
 
-static jmp_buf env;
-static 
-#ifdef SIGNALRETURNSINT
-int
-#else
-void
+/* defined by autoconf AC_TYPE_SIGNAL, need to define for Imake */
+#ifndef RETSIGTYPE 
+# ifdef SIGNALRETURNSINT
+#  define RETSIGTYPE int
+# else
+#  define RETSIGTYPE void
+# endif
 #endif
+
+static jmp_buf env;
+static RETSIGTYPE
 nameserver_lost(int sig)
 {
   nameserver_timedout = True;