Integrate mainline (but don't integrate back yet).

p4raw-id: //depot/perlio@19614

diff --cc ext/Encode/Encode.xs
index 7d9555a,7970058..1695c8f
--- 1/ext/Encode/Encode.xs
--- 2/ext/Encode/Encode.xs
+++ b/ext/Encode/Encode.xs
@@@ -256,8 -256,18 +256,18 @@@ encode_method(pTHX_ encode_t * enc, enc
      return dst;
  }
  
 -MODULE = Encode               PACKAGE = Encode::utf8  PREFIX = Method_
 +MODULE = Encode         PACKAGE = Encode::utf8  PREFIX = Method_
  
+ PROTOTYPES: DISABLE
+ 
+ void
+ Method_renew(obj)
+ SV *  obj
+ CODE:
+ {
+     XSRETURN(1);
+ }
+ 
  void
  Method_decode_xs(obj,src,check = 0)
  SV *  obj
@@@ -389,8 -399,16 +399,16 @@@ MODULE = Encode         PACKAGE = Encod
  PROTOTYPES: ENABLE
  
  void
+ Method_renew(obj)
+ SV *  obj
+ CODE:
+ {
+     XSRETURN(1);
+ }
+ 
+ void
  Method_name(obj)
 -SV *  obj
 +SV *    obj
  CODE:
  {
      encode_t *enc = INT2PTR(encode_t *, SvIV(SvRV(obj)));

diff --cc perlio.c
index d0ed97a,05b53c9..2e11ab6
--- 1/perlio.c
--- 2/perlio.c
+++ b/perlio.c
@@@ -5053,3 -4993,3 +5053,4 @@@ PerlIO_sprintf(char *s, int n, const ch
  
  
  
++

diff --cc perlio.h
Simple merge