From: Nick Ing-Simmons Date: Sat, 2 Oct 1999 11:11:44 +0000 (+0000) Subject: Incremental merge of mainline X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=33d8f7c1afe01d04914301ea81b4771b23fc2612;p=p5sagit%2Fp5-mst-13.2.git Incremental merge of mainline p4raw-id: //depot/utfperl@4286 --- 33d8f7c1afe01d04914301ea81b4771b23fc2612 diff --cc global.sym index 5ee74d7,7200c60..9a52b98 --- a/global.sym +++ b/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