Integrate mainline

p4raw-id: //depot/perlio@7945

diff --cc perlio.c
index eb25314,9011573..d0c3b2e
--- 1/perlio.c
--- 2/perlio.c
+++ b/perlio.c
@@@ -965,11 -950,9 +965,11 @@@ PerlIOBase_pushed(PerlIO *f, const cha
                   (PERLIO_F_CANREAD|PERLIO_F_CANWRITE|PERLIO_F_TRUNCATE|PERLIO_F_APPEND);
      }
    }
 +#if 0
-  PerlIO_debug("PerlIOBase_pushed f=%p %s %s fl=%08x (%s)\n",
+  PerlIO_debug("PerlIOBase_pushed f=%p %s %s fl=%08"UVxf" (%s)\n",
                f,PerlIOBase(f)->tab->name,(omode) ? omode : "(Null)",
                l->flags,PerlIO_modestr(f,temp));
 +#endif
   return 0;
  }
  
@@@ -1723,10 -1689,8 +1723,10 @@@ PerlIOBuf_fdopen(PerlIO_funcs *self, in
       /* Initial stderr is unbuffered */
       PerlIOBase(f)->flags |= PERLIO_F_UNBUF;
      }
 +#if 0
-    PerlIO_debug("PerlIOBuf_fdopen %s f=%p fd=%d m=%s fl=%08x\n",
+    PerlIO_debug("PerlIOBuf_fdopen %s f=%p fd=%d m=%s fl=%08"UVxf"\n",
                  self->name,f,fd,mode,PerlIOBase(f)->flags);
 +#endif
    }
   return f;
  }
@@@ -2273,12 -2128,10 +2273,12 @@@ PerlIOCrlf_pushed(PerlIO *f, const cha
  {
   IV code;
   PerlIOBase(f)->flags |= PERLIO_F_CRLF;
 - code = PerlIOBase_pushed(f,mode);
 + code = PerlIOBuf_pushed(f,mode);
 +#if 0
-  PerlIO_debug("PerlIOCrlf_pushed f=%p %s %s fl=%08x\n",
+  PerlIO_debug("PerlIOCrlf_pushed f=%p %s %s fl=%08"UVxf"\n",
                f,PerlIOBase(f)->tab->name,(mode) ? mode : "(Null)",
                PerlIOBase(f)->flags);
 +#endif
   return code;
  }