Integrate mainline

p4raw-id: //depot/perlio@17402

diff --combined embed.fnc
index fb0e213,698741c..922d8d8
--- 1/embed.fnc
--- 2/embed.fnc
+++ b/embed.fnc
@@@ -883,7 -883,7 +883,7 @@@ Apd        |void   |sv_setpvn_mg   |SV *sv|const c
  Apd   |void   |sv_setsv_mg    |SV *dstr|SV *sstr
  Apd   |void   |sv_usepvn_mg   |SV *sv|char *ptr|STRLEN len
  Ap    |MGVTBL*|get_vtbl       |int vtbl_id
- p     |char*  |pv_display     |SV *dsv|char *pv|STRLEN cur|STRLEN len \
+ Ap    |char*  |pv_display     |SV *dsv|char *pv|STRLEN cur|STRLEN len \
                                |STRLEN pvlim
  Afp   |void   |dump_indent    |I32 level|PerlIO *file|const char* pat|...
  Ap    |void   |dump_vindent   |I32 level|PerlIO *file|const char* pat \
@@@ -1033,7 -1033,7 +1033,7 @@@ s       |void   |apply_attrs    |HV *stash|SV *tar
  s     |void   |apply_attrs_my |HV *stash|OP *target|OP *attrs|OP **imopsp
  #  if defined(PL_OP_SLAB_ALLOC)
  s     |void*  |Slab_Alloc     |int m|size_t sz
 -s      |void   |Slab_Free      |void *op
 +s     |void   |Slab_Free      |void *op
  #  endif
  #endif