Integrate mainline

p4raw-id: //depot/perlio@16038

diff --cc ext/Encode/Encode.pm
Simple merge

diff --cc ext/Encode/Encode.xs
Simple merge

diff --cc ext/Encode/t/perlio.t
index 671be8a,52a161b..2efd4a8
--- 1/ext/Encode/t/perlio.t
--- 2/ext/Encode/t/perlio.t
+++ b/ext/Encode/t/perlio.t
@@@ -56,16 -58,12 +58,12 @@@ for my $e (qw/euc-jp shiftjis 7bit-jis 
      my $pfile = File::Spec->catfile($dir,"$$.pio");
  
      # first create a file without perlio
-     open $fh, ">", $sfile or die "$sfile :$!";
-     binmode $fh;
-     print $fh &encode($e, $utext, 0);
-     close $fh;
+     dump2file($sfile, &encode($e, $utext, 0));
 -    
 +
      # then create a file via perlio without autoflush
        
- # TODO:{
- #        local $TODO = "perlio broken";
- #     todo_skip "$e: !perlio_ok", 1  unless perlio_ok($e);
+  SKIP:{
+       skip "$e: !perlio_ok", 1  unless perlio_ok($e) or $DEBUG;
        open $fh, ">:encoding($e)", $pfile or die "$sfile : $!";
        $fh->autoflush(0);
        print $fh $utext;

diff --cc perl.h
Simple merge