From 34036ec32ec6de6ff34057bdfec3eeb8850eeca7 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Tue, 3 Jan 2012 01:40:15 +0000
Subject: [PATCH] =?UTF-8?q?MSYS=20implies=20-DMKSH=5FASSUME=5FUTF8=3D0=20a?=
 =?UTF-8?q?nd=20thus=20can=20skip=20the=20test=20that=E2=80=99d=20fail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Build.sh | 9 +++++----
 check.t  | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Build.sh b/Build.sh
index a913ce4..7202a15 100644
--- a/Build.sh
+++ b/Build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.504 2012/01/03 01:30:16 tg Exp $'
+srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.505 2012/01/03 01:40:13 tg Exp $'
 #-
 # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #		2011, 2012
@@ -442,7 +442,7 @@ GNU/kFreeBSD)
 	esac
 	;;
 Haiku)
-	add_cppflags -DMKSH_ASSUME_UTF8
+	add_cppflags -DMKSH_ASSUME_UTF8; HAVE_ISSET_MKSH_ASSUME_UTF8=1
 	;;
 HP-UX)
 	;;
@@ -477,6 +477,7 @@ Minix)
 MirBSD)
 	;;
 MSYS_*)
+	add_cppflags -DMKSH_ASSUME_UTF8=0; HAVE_ISSET_MKSH_ASSUME_UTF8=1
 	# almost same as CYGWIN* (from RT|Chatzilla)
 	: ${HAVE_SETLOCALE_CTYPE=0}
 	# broken on this OE (from ir0nh34d)
@@ -500,7 +501,7 @@ Plan9)
 	add_cppflags -D_LIMITS_EXTENSION
 	add_cppflags -D_BSD_EXTENSION
 	add_cppflags -D_SUSV2_SOURCE
-	add_cppflags -DMKSH_ASSUME_UTF8
+	add_cppflags -DMKSH_ASSUME_UTF8; HAVE_ISSET_MKSH_ASSUME_UTF8=1
 	oswarn=' and will currently not work'
 	add_cppflags -DMKSH_UNEMPLOYED
 	;;
@@ -1261,7 +1262,7 @@ else
 		#define EXTERN
 		#define MKSH_INCLUDES_ONLY
 		#include "sh.h"
-		__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.504 2012/01/03 01:30:16 tg Exp $");
+		__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.505 2012/01/03 01:40:13 tg Exp $");
 		int main(void) { printf("Hello, World!\n"); return (0); }
 EOF
 	case $cm in
diff --git a/check.t b/check.t
index 4fe7755..4cd3ed7 100644
--- a/check.t
+++ b/check.t
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/check.t,v 1.508 2012/01/03 00:58:07 tg Exp $
+# $MirOS: src/bin/mksh/check.t,v 1.509 2012/01/03 01:40:15 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 $
@@ -6048,7 +6048,7 @@ description:
 	-UMKSH_ASSUME_UTF8 => not expected, but if your OS is old,
 	 try passing HAVE_SETLOCALE_CTYPE=0 to Build.sh
 need-pass: no
-category: !os:hpux
+category: !os:hpux,!os:msys
 need-ctty: yes
 arguments: !-i!
 env-setup: !PS1=!PS2=!LC_CTYPE=en_US.UTF-8!