Re-integrate mainline

Basic SvUTF8 stuff in headers, no functional changes yet.

p4raw-id: //depot/utfperl@4193

1 files changed, 12 insertions, 2 deletions

diff --git a/proto.h b/proto.h
index ddb31429fa..9ca65d934a 100644
--- a/proto.h
+++ b/proto.h
@@ -560,11 +560,15 @@ VIRTUAL IV	Perl_sv_2iv(pTHX_ SV* sv);
 VIRTUAL SV*	Perl_sv_2mortal(pTHX_ SV* sv);
 VIRTUAL NV	Perl_sv_2nv(pTHX_ SV* sv);
 VIRTUAL char*	Perl_sv_2pv(pTHX_ SV* sv, STRLEN* lp);
+VIRTUAL char*	Perl_sv_2pvutf8(pTHX_ SV* sv, STRLEN* lp);
+VIRTUAL char*	Perl_sv_2pvbyte(pTHX_ SV* sv, STRLEN* lp);
 VIRTUAL UV	Perl_sv_2uv(pTHX_ SV* sv);
 VIRTUAL IV	Perl_sv_iv(pTHX_ SV* sv);
 VIRTUAL UV	Perl_sv_uv(pTHX_ SV* sv);
 VIRTUAL NV	Perl_sv_nv(pTHX_ SV* sv);
 VIRTUAL char*	Perl_sv_pvn(pTHX_ SV *sv, STRLEN *len);
+VIRTUAL char*	Perl_sv_pvutf8n(pTHX_ SV *sv, STRLEN *len);
+VIRTUAL char*	Perl_sv_pvbyten(pTHX_ SV *sv, STRLEN *len);
 VIRTUAL I32	Perl_sv_true(pTHX_ SV *sv);
 VIRTUAL void	Perl_sv_add_arena(pTHX_ char* ptr, U32 size, U32 flags);
 VIRTUAL int	Perl_sv_backoff(pTHX_ SV* sv);
@@ -606,6 +610,8 @@ VIRTUAL char*	Perl_sv_peek(pTHX_ SV* sv);
 VIRTUAL void	Perl_sv_pos_u2b(pTHX_ SV* sv, I32* offsetp, I32* lenp);
 VIRTUAL void	Perl_sv_pos_b2u(pTHX_ SV* sv, I32* offsetp);
 VIRTUAL char*	Perl_sv_pvn_force(pTHX_ SV* sv, STRLEN* lp);
+VIRTUAL char*	Perl_sv_pvutf8n_force(pTHX_ SV* sv, STRLEN* lp);
+VIRTUAL char*	Perl_sv_pvbyten_force(pTHX_ SV* sv, STRLEN* lp);
 VIRTUAL char*	Perl_sv_reftype(pTHX_ SV* sv, int ob);
 VIRTUAL void	Perl_sv_replace(pTHX_ SV* sv, SV* nsv);
 VIRTUAL void	Perl_sv_report_used(pTHX);
@@ -630,8 +636,8 @@ VIRTUAL void	Perl_sv_unref(pTHX_ SV* sv);
 VIRTUAL void	Perl_sv_untaint(pTHX_ SV* sv);
 VIRTUAL bool	Perl_sv_upgrade(pTHX_ SV* sv, U32 mt);
 VIRTUAL void	Perl_sv_usepvn(pTHX_ SV* sv, char* ptr, STRLEN len);
-VIRTUAL void	Perl_sv_vcatpvfn(pTHX_ SV* sv, const char* pat, STRLEN patlen, va_list* args, SV** svargs, I32 svmax, bool *used_locale);
-VIRTUAL void	Perl_sv_vsetpvfn(pTHX_ SV* sv, const char* pat, STRLEN patlen, va_list* args, SV** svargs, I32 svmax, bool *used_locale);
+VIRTUAL void	Perl_sv_vcatpvfn(pTHX_ SV* sv, const char* pat, STRLEN patlen, va_list* args, SV** svargs, I32 svmax, bool *maybe_tainted);
+VIRTUAL void	Perl_sv_vsetpvfn(pTHX_ SV* sv, const char* pat, STRLEN patlen, va_list* args, SV** svargs, I32 svmax, bool *maybe_tainted);
 VIRTUAL SV*	Perl_swash_init(pTHX_ char* pkg, char* name, SV* listsv, I32 minbits, I32 none);
 VIRTUAL UV	Perl_swash_fetch(pTHX_ SV *sv, U8 *ptr);
 VIRTUAL void	Perl_taint_env(pTHX);
@@ -724,7 +730,11 @@ VIRTUAL void*	Perl_default_protect(pTHX_ int *excpt, protect_body_t body, ...);
 VIRTUAL void*	Perl_vdefault_protect(pTHX_ int *excpt, protect_body_t body, va_list *args);
 VIRTUAL void	Perl_reginitcolors(pTHX);
 VIRTUAL char*	Perl_sv_2pv_nolen(pTHX_ SV* sv);
+VIRTUAL char*	Perl_sv_2pvutf8_nolen(pTHX_ SV* sv);
+VIRTUAL char*	Perl_sv_2pvbyte_nolen(pTHX_ SV* sv);
 VIRTUAL char*	Perl_sv_pv(pTHX_ SV *sv);
+VIRTUAL char*	Perl_sv_pvutf8(pTHX_ SV *sv);
+VIRTUAL char*	Perl_sv_pvbyte(pTHX_ SV *sv);
 VIRTUAL void	Perl_sv_force_normal(pTHX_ SV *sv);
 VIRTUAL void	Perl_tmps_grow(pTHX_ I32 n);
 VIRTUAL SV*	Perl_sv_rvweaken(pTHX_ SV *sv);