From 5e22cb486f40cff646222e65906e8257dbe5e21a Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Fri, 20 Feb 2009 13:25:10 +0000
Subject: [PATCH] <sys/file.h> is only required for, and only contains,
 flock(2)

---
 check.t   | 4 ++--
 histrap.c | 5 ++++-
 sh.h      | 5 ++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/check.t b/check.t
index 41eb15a..846156d 100644
--- a/check.t
+++ b/check.t
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/check.t,v 1.254 2008/12/29 21:34:18 tg Exp $
+# $MirOS: src/bin/mksh/check.t,v 1.255 2009/02/20 13:25:08 tg Exp $
 # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@@ -7,7 +7,7 @@
 # http://www.research.att.com/~gsf/public/ifs.sh
 
 expected-stdout:
-	@(#)MIRBSD KSH R36 2008/12/29
+	@(#)MIRBSD KSH R36 2009/02/20
 description:
 	Check version of shell.
 stdin:
diff --git a/histrap.c b/histrap.c
index 8837a0d..f62acba 100644
--- a/histrap.c
+++ b/histrap.c
@@ -2,8 +2,11 @@
 /*	$OpenBSD: trap.c,v 1.22 2005/03/30 17:16:37 deraadt Exp $	*/
 
 #include "sh.h"
+#if HAVE_PERSISTENT_HISTORY
+#include <sys/file.h>
+#endif
 
-__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.76 2008/12/13 17:02:14 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.77 2009/02/20 13:25:09 tg Exp $");
 
 /*-
  * MirOS: This is the default mapping type, and need not be specified.
diff --git a/sh.h b/sh.h
index d6e58e8..841f6aa 100644
--- a/sh.h
+++ b/sh.h
@@ -17,7 +17,6 @@
 #endif
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/file.h>
 #include <sys/ioctl.h>
 #if HAVE_SYS_SYSMACROS_H
 #include <sys/sysmacros.h>
@@ -103,9 +102,9 @@
 #define __SCCSID(x)	__IDSTRING(sccsid,x)
 
 #ifdef EXTERN
-__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.272 2008/12/29 21:34:21 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.273 2009/02/20 13:25:10 tg Exp $");
 #endif
-#define MKSH_VERSION "R36 2008/12/29"
+#define MKSH_VERSION "R36 2009/02/20"
 
 #ifndef MKSH_INCLUDES_ONLY