integrate cfgperl changes#6242..6249 into mainline

p4raw-link: @6249 on //depot/cfgperl: cab27d238e930b8cddb5b1fb3260355f913b86a6
p4raw-link: @6242 on //depot/cfgperl: 1e72252ad7b8e23d1a1142285b8aa82986bd2491

p4raw-id: //depot/perl@6359
p4raw-integrated: from //depot/cfgperl@6358 'copy in'
	ext/DynaLoader/DynaLoader_pm.PL (@5953..) t/lib/peek.t
	(@6086..) t/lib/filefunc.t t/lib/filespec.t (@6230..)
	pod/perlintern.pod (@6237..) pod/perlapi.pod utf8.c (@6242..)
p4raw-integrated: from //depot/cfgperl@6249 'copy in' lib/IPC/Open3.pm
	(@5937..)
p4raw-integrated: from //depot/cfgperl@6248 'copy in' pod/perlfunc.pod
	(@6206..)
p4raw-integrated: from //depot/cfgperl@6247 'ignore' lib/File/Spec.pm
	(@6230..)
p4raw-integrated: from //depot/cfgperl@6244 'copy in' gv.c (@6217..)
	'merge in' sv.c (@6196..)
p4raw-integrated: from //depot/cfgperl@6243 'copy in' pp_proto.h
	(@6237..) 'ignore' embedvar.h perlapi.h (@6237..) 'merge in'
	embed.h objXSUB.h (@6237..) embed.pl perlapi.c proto.h
	(@6242..)

1 files changed, 8 insertions, 1 deletions

diff --git a/perlapi.c b/perlapi.c
index 4086f64323..57e1b9ceef 100644
--- a/perlapi.c
+++ b/perlapi.c
@@ -1326,6 +1326,13 @@ Perl_is_utf8_char(pTHXo_ U8 *p)
     return ((CPerlObj*)pPerl)->Perl_is_utf8_char(p);
 }
 
+#undef  Perl_is_utf8_string
+bool
+Perl_is_utf8_string(pTHXo_ U8 *s, STRLEN len)
+{
+    return ((CPerlObj*)pPerl)->Perl_is_utf8_string(s, len);
+}
+
 #undef  Perl_is_utf8_alnum
 bool
 Perl_is_utf8_alnum(pTHXo_ U8 *p)
@@ -3352,7 +3359,7 @@ Perl_utf8_to_bytes(pTHXo_ U8 *s, STRLEN len)
 
 #undef  Perl_bytes_to_utf8
 U8*
-Perl_bytes_to_utf8(pTHXo_ U8 *s, STRLEN len)
+Perl_bytes_to_utf8(pTHXo_ U8 *s, STRLEN *len)
 {
     return ((CPerlObj*)pPerl)->Perl_bytes_to_utf8(s, len);
 }