diff options
| -rw-r--r-- | gethost.c | 21 | ||||
| -rw-r--r-- | parsedpy.c | 5 | ||||
| -rw-r--r-- | process.c | 10 | ||||
| -rw-r--r-- | xauth.c | 5 |
4 files changed, 34 insertions, 7 deletions
@@ -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; @@ -1,5 +1,6 @@ /* * $Xorg: parsedpy.c,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ + * $XdotOrg: $ * * parse_displayname - utility routine for splitting up display name strings * @@ -31,6 +32,10 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/xauth/parsedpy.c,v 3.7 2003/07/09 15:27:37 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdio.h> /* for NULL */ #include <ctype.h> /* for isascii() and isdigit() */ #include <X11/Xos.h> /* for strchr() and string routines */ @@ -1,5 +1,5 @@ /* $Xorg: process.c,v 1.6 2001/02/09 02:05:38 xorgcvs Exp $ */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/xauth/process.c,v 1.3 2004/04/24 23:26:55 alanc Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -33,6 +33,10 @@ from The Open Group. * Author: Jim Fulton, MIT X Consortium */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "xauth.h" #include <ctype.h> #include <errno.h> @@ -626,11 +630,15 @@ static Bool xauth_locked = False; /* if has been locked */ static char *xauth_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))) @@ -1,5 +1,6 @@ /* * $Xorg: xauth.c,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ + * $XdotOrg: $ * * xauth - manipulate authorization file * @@ -30,6 +31,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/xauth/xauth.c,v 1.5tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "xauth.h" |