From ecc6beb7d572b9f480e4a2a5e5f8ac01ffdef35d Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Wed, 17 Jan 2007 23:54:39 +0000
Subject: [PATCH] scan for sig_t (and friends)

---
 Build.sh | 30 ++++++++++++++++++++++++++++--
 sh.h     |  6 +-----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/Build.sh b/Build.sh
index 17e399f..157ace0 100644
--- a/Build.sh
+++ b/Build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $MirOS: src/bin/mksh/Build.sh,v 1.135 2007/01/17 23:50:26 tg Exp $
+# $MirOS: src/bin/mksh/Build.sh,v 1.136 2007/01/17 23:54:39 tg Exp $
 #-
 # Env: CC, CFLAGS, CPP, CPPFLAGS, LDFLAGS, LIBS, NOWARN, NROFF, TARGET_OS
 # CPPFLAGS recognised: MKSH_SMALL MKSH_NOPWNAM
@@ -320,6 +320,32 @@ ac_test rlim_t <<-'EOF'
 	int main(void) { return ((int)(rlim_t)0); }
 EOF
 
+ac_testn sig_t <<-'EOF'
+	#include <sys/types.h>
+	#include <signal.h>
+	int main(void) { return ((int)(sig_t)0); }
+EOF
+
+ac_testn sighandler_t '!' sig_t 0 <<-'EOF'
+	#include <sys/types.h>
+	#include <signal.h>
+	int main(void) { return ((int)(sighandler_t)0); }
+EOF
+if test 1 = $HAVE_SIGHANDLER_T; then
+	CPPFLAGS="$CPPFLAGS -Dsig_t=sighandler_t"
+	HAVE_SIG_T=1
+fi
+
+ac_testn __sighandler_t '!' sig_t 0 <<-'EOF'
+	#include <sys/types.h>
+	#include <signal.h>
+	int main(void) { return ((int)(__sighandler_t)0); }
+EOF
+if test 1 = $HAVE_SIGHANDLER_T; then
+	CPPFLAGS="$CPPFLAGS -Dsig_t=__sighandler_t"
+	HAVE_SIG_T=1
+fi
+
 #
 # Environment: signals
 #
@@ -356,8 +382,8 @@ ac_testn _sys_siglist '!' sys_siglist 0 'the _sys_siglist[] array' <<-'EOF'
 	int main(void) { return (_sys_siglist[0][0]); }
 EOF
 if test 1 = $HAVE__SYS_SIGLIST; then
-	HAVE_SYS_SIGLIST=1
 	CPPFLAGS="$CPPFLAGS -Dsys_siglist=_sys_siglist"
+	HAVE_SYS_SIGLIST=1
 fi
 CPPFLAGS="$CPPFLAGS -DHAVE_SYS_SIGLIST=$HAVE_SYS_SIGLIST"
 
diff --git a/sh.h b/sh.h
index d8182c1..2a2db78 100644
--- a/sh.h
+++ b/sh.h
@@ -8,7 +8,7 @@
 /*	$OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $	*/
 /*	$OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $	*/
 
-#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.104 2007/01/17 23:18:55 tg Exp $"
+#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.105 2007/01/17 23:54:39 tg Exp $"
 #define MKSH_VERSION "R29 2007/01/17"
 
 #if HAVE_SYS_PARAM_H
@@ -373,10 +373,6 @@ struct temp {
 #define shl_out		(&shf_iob[2])
 EXTERN int shl_stdout_ok;
 
-#if defined(__sun__) || defined(__CYGWIN__)
-typedef void (*sig_t)(int);
-#endif
-
 /*
  * trap handlers
  */