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

1 files changed, 14 insertions, 4 deletions

diff --git a/x11perf.c b/x11perf.c
index ed6fb87..164bd5a 100644
--- a/x11perf.c
+++ b/x11perf.c
@@ -1,4 +1,5 @@
 /* $Xorg: x11perf.c,v 1.4 2000/08/17 19:54:10 cpqbld Exp $ */
+/* $XdotOrg: $ */
 /****************************************************************************
 Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -23,6 +24,10 @@ SOFTWARE.
 ****************************************************************************/
 /* $XFree86: xc/programs/x11perf/x11perf.c,v 3.6 2001/11/03 21:59:20 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
@@ -394,11 +399,16 @@ Open_Display(char *display_name)
 }
 
 
-#ifdef SIGNALRETURNSINT
-static int
-#else
-static 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 RETSIGTYPE
 Cleanup(int sig)
 {
     abortTest = sig;