Incremental merge of mainline
Nick Ing-Simmons [Sat, 2 Oct 1999 11:11:44 +0000 (11:11 +0000)]
p4raw-id: //depot/utfperl@4286

1  2 
embed.h
embed.pl
global.sym
objXSUB.h
perl.h
perlapi.c
pp_hot.c
proto.h
sv.h

diff --cc embed.h
Simple merge
diff --cc embed.pl
Simple merge
diff --cc global.sym
@@@ -512,11 -515,11 +515,15 @@@ Perl_sv_2i
  Perl_sv_2mortal
  Perl_sv_2nv
  Perl_sv_2pv
++Perl_sv_2pvutf8
++Perl_sv_2pvbyte
  Perl_sv_2uv
  Perl_sv_iv
  Perl_sv_uv
  Perl_sv_nv
  Perl_sv_pvn
++Perl_sv_pvutf8n
++Perl_sv_pvbyten
  Perl_sv_true
  Perl_sv_add_arena
  Perl_sv_backoff
@@@ -556,6 -559,6 +563,8 @@@ Perl_sv_pee
  Perl_sv_pos_u2b
  Perl_sv_pos_b2u
  Perl_sv_pvn_force
++Perl_sv_pvutf8n_force
++Perl_sv_pvbyten_force
  Perl_sv_reftype
  Perl_sv_replace
  Perl_sv_report_used
@@@ -661,7 -664,7 +670,11 @@@ Perl_default_protec
  Perl_vdefault_protect
  Perl_reginitcolors
  Perl_sv_2pv_nolen
++Perl_sv_2pvutf8_nolen
++Perl_sv_2pvbyte_nolen
  Perl_sv_pv
++Perl_sv_pvutf8
++Perl_sv_pvbyte
  Perl_sv_force_normal
  Perl_tmps_grow
  Perl_sv_rvweaken
diff --cc objXSUB.h
Simple merge
diff --cc perl.h
Simple merge
diff --cc perlapi.c
Simple merge
diff --cc pp_hot.c
Simple merge
diff --cc proto.h
Simple merge
diff --cc sv.h
Simple merge