summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gethost.c9
-rw-r--r--process.c13
2 files changed, 2 insertions, 20 deletions
diff --git a/gethost.c b/gethost.c
index 2047326..a0f30da 100644
--- a/gethost.c
+++ b/gethost.c
@@ -88,15 +88,6 @@ static volatile Bool nameserver_timedout = False;
* be found. Stolen from xhost.
*/
-/* 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)
diff --git a/process.c b/process.c
index 105305b..4cb2b56 100644
--- a/process.c
+++ b/process.c
@@ -630,21 +630,12 @@ 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)))
/* ARGSUSED */
-static _signal_t
+static RETSIGTYPE
die(int sig)
{
dieing = True;
@@ -655,7 +646,7 @@ die(int sig)
#endif
}
-static _signal_t
+static RETSIGTYPE
catchsig(int sig)
{
#ifdef SYSV