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

    autoconf in addition to Imake's SIGNALRETURNSINT. Use
    HAVE_WORKING_VFORK if defined by autoconf in addition to Imake's
    HAS_VFORK

2 files changed, 8 insertions, 0 deletions

diff --git a/iceauth.h b/iceauth.h
index 1e7764f..727a1a7 100644
--- a/iceauth.h
+++ b/iceauth.h
@@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group.
 
 /* $XFree86: xc/programs/iceauth/iceauth.h,v 3.4 2001/07/25 15:05:13 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdio.h>
 #include <X11/Xos.h>
 #include <X11/ICE/ICElib.h>
diff --git a/process.c b/process.c
index 4f938b7..f149941 100644
--- a/process.c
+++ b/process.c
@@ -492,11 +492,15 @@ static Bool iceauth_allowed = True;	/* if allowed to write auth file */
 static char *iceauth_filename = NULL;
 static volatile Bool dieing = False;
 
+#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 */
 
 /* poor man's puts(), for under signal handlers */
 #define WRITES(fd, S) (void)write((fd), (S), strlen((S)))