From 0a20bb8dd4b5ab7659ba84a00b4cd74c07c1a87d Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Sun, 4 Mar 2007 04:36:45 +0000
Subject: [PATCH] =?UTF-8?q?=E2=80=A2=20Minix=203=20doesn't=20have=20<sys/m?=
 =?UTF-8?q?man.h>=20=E2=80=A2=20Some=20OSes=20might=20need=20<stdint.h>=20?=
 =?UTF-8?q?for=20int32=5Ft=20(Minix=203=20with=20GCC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Build.sh |  4 +++-
 Makefile | 18 +++++++++---------
 sh.h     |  7 ++++++-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Build.sh b/Build.sh
index 4944e57..2b9c293 100644
--- a/Build.sh
+++ b/Build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $MirOS: src/bin/mksh/Build.sh,v 1.157 2007/03/04 04:28:58 tg Exp $
+# $MirOS: src/bin/mksh/Build.sh,v 1.158 2007/03/04 04:36:45 tg Exp $
 #-
 # Environment used: CC CFLAGS CPP CPPFLAGS LDFLAGS LIBS NOWARN NROFF TARGET_OS
 # CPPFLAGS recognised: MKSH_SMALL MKSH_ASSUME_UTF8 MKSH_NEED_MKNOD MKSH_NOPWNAM
@@ -344,10 +344,12 @@ fi
 #
 ac_header sys/param.h
 ac_header sys/mkdev.h
+ac_header sys/mman.h sys/types.h
 ac_header sys/sysmacros.h
 ac_header libgen.h
 ac_header paths.h
 ac_header stdbool.h
+ac_header stdint.h
 ac_header grp.h sys/types.h
 ac_header ulimit.h
 ac_header values.h
diff --git a/Makefile b/Makefile
index 03ff602..61c3196 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/Makefile,v 1.34 2007/03/04 03:04:23 tg Exp $
+# $MirOS: src/bin/mksh/Makefile,v 1.35 2007/03/04 04:36:45 tg Exp $
 #-
 # use CPPFLAGS=-DDEBUG __CRAZY=Yes to check for certain more stuff
 
@@ -11,17 +11,17 @@ SRCS=		alloc.c edit.c eval.c exec.c expr.c funcs.c histrap.c \
 CPPFLAGS+=	-DMKSH_ASSUME_UTF8 \
 		-DHAVE_ATTRIBUTE=1 -DHAVE_ATTRIBUTE_BOUNDED=1 \
 		-DHAVE_ATTRIBUTE_USED=1 -DHAVE_SYS_PARAM_H=1 \
-		-DHAVE_SYS_MKDEV_H=0 -DHAVE_SYS_SYSMACROS_H=0 \
-		-DHAVE_LIBGEN_H=1 -DHAVE_PATHS_H=1 -DHAVE_STDBOOL_H=1 \
-		-DHAVE_GRP_H=1 -DHAVE_ULIMIT_H=0 -DHAVE_VALUES_H=0 \
-		-DHAVE_RLIM_T=1 -DHAVE_SIG_T=1 -DHAVE_MKSH_SIGNAME=0 \
-		-DHAVE_SYS_SIGNAME=1 -DHAVE__SYS_SIGNAME=0 \
-		-DHAVE_SYS_SIGLIST=1 -DHAVE_STRSIGNAL=0 -DHAVE_ARC4RANDOM=1 \
-		-DHAVE_ARC4RANDOM_PUSH=1 -DHAVE_FLOCK_EX=1 \
+		-DHAVE_SYS_MKDEV_H=0 -DHAVE_SYS_MMAN_H=1 \
+		-DHAVE_SYS_SYSMACROS_H=0 -DHAVE_LIBGEN_H=1 -DHAVE_PATHS_H=1 \
+		-DHAVE_STDBOOL_H=1 -DHAVE_STDINT_H=1 -DHAVE_GRP_H=1 \
+		-DHAVE_ULIMIT_H=0 -DHAVE_VALUES_H=0 -DHAVE_RLIM_T=1 \
+		-DHAVE_SIG_T=1 -DHAVE_MKSH_SIGNAME=0 -DHAVE_SYS_SIGNAME=1 \
+		-DHAVE__SYS_SIGNAME=0 -DHAVE_SYS_SIGLIST=1 -DHAVE_STRSIGNAL=0 \
+		-DHAVE_ARC4RANDOM=1 -DHAVE_ARC4RANDOM_PUSH=1 -DHAVE_FLOCK_EX=1 \
 		-DHAVE_SETLOCALE_CTYPE=0 -DHAVE_LANGINFO_CODESET=0 \
 		-DHAVE_REVOKE=1 -DHAVE_SETMODE=1 -DHAVE_SETRESUGID=1 \
 		-DHAVE_SETGROUPS=1 -DHAVE_STRCASESTR=1 -DHAVE_STRLCPY=1 \
-		-DHAVE_MULTI_IDSTRING=1 -DHAVE_PERSISTENT_HISTORY=1
+		-DHAVE_PERSISTENT_HISTORY=1 -DHAVE_MULTI_IDSTRING=1
 COPTS+=		-std=gnu99 -Wall
 .endif
 
diff --git a/sh.h b/sh.h
index 9c991d0..cdbf68b 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.115 2007/03/04 03:04:27 tg Exp $"
+#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.116 2007/03/04 04:36:45 tg Exp $"
 #define MKSH_VERSION "R29 2007/03/04"
 
 #if HAVE_SYS_PARAM_H
@@ -44,7 +44,9 @@
 #if HAVE_SYS_MKDEV_H
 #include <sys/mkdev.h>
 #endif
+#if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
+#endif
 #include <sys/resource.h>
 #include <sys/stat.h>
 #if HAVE_SYS_SYSMACROS_H
@@ -69,6 +71,9 @@
 #include <stdbool.h>
 #endif
 #include <stddef.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>