Integrate mainline (STDCHAR)

p4raw-id: //depot/perlio@7966

2 files changed, 12 insertions, 16 deletions

diff --git a/Configure b/Configure
index 30300d82c4..cb9fa9448d 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Sat Dec  2 18:39:37 EET 2000 [metaconfig 3.0 PL70]
+# Generated on Sun Dec  3 18:14:37 EET 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >/tmp/c1$$ <<EOF
@@ -14493,24 +14493,17 @@ $rm -f ssize ssize.*
 
 : see what type of char stdio uses.
 echo " "
-if $contains 'unsigned.*char.*_ptr;' `./findhdr stdio.h` >/dev/null 2>&1 ; then
+echo '#include <stdio.h>' | $cppstdin $cppminus > stdioh
+if $contains 'unsigned.*char.*_ptr;' stdioh >/dev/null 2>&1 ; then
 	echo "Your stdio uses unsigned chars." >&4
 	stdchar="unsigned char"
 else
-	: Solaris 7+, others?
-	stdiohdr=`./findhdr stdio_impl.h`
-	case "$stdiohdr" in
-	'') ;;
-	*)	if $contains 'unsigned.*char.*_ptr;' $stdiohdr >/dev/null 2>&1 ; then
-			echo "Your stdio uses unsigned chars." >&4
-			stdchar="unsigned char"
-		else
-			echo "Your stdio uses signed chars." >&4
-			stdchar="char"
-		fi
-		;;
-	esac
+	echo "Your stdio uses signed chars." >&4
+	stdchar="char"
 fi
+$rm -f stdioh
+
+
 
 : see if time exists
 echo " "
diff --git a/t/pragma/utf8.t b/t/pragma/utf8.t
index 93a5bc4595..60cbd8c97a 100755
--- a/t/pragma/utf8.t
+++ b/t/pragma/utf8.t
@@ -569,12 +569,15 @@ sub nok_bytes {
 # http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt,
 # version dated 2000-09-02. 
 
+# Note the \0 instead of a raw zero byte in 2.1.1: for example
+# GNU patch v2.1 has "issues" with raw zero bytes.
+
 my @MK = split(/\n/, <<__EOMK__);
 1	Correct UTF-8
 1.1.1 y "κόσμε"	-		11	ce:ba:e1:bd:b9:cf:83:ce:bc:ce:b5	5
 2	Boundary conditions 
 2.1	First possible sequence of certain length
-2.1.1 y "
+2.1.1 y "\0"			0		1	00	1
 2.1.2 y "€"			80		2	c2:80	1
 2.1.3 y "ࠀ"		800		3	e0:a0:80	1
 2.1.4 y "𐀀"		10000		4	f0:90:80:80	1