Incremental merge of mainline

p4raw-id: //depot/utfperl@4286

1 files changed, 109 insertions, 2 deletions

diff --git a/embed.h b/embed.h
index 393ba3efdf..bbe00a13c5 100644
--- a/embed.h
+++ b/embed.h
@@ -29,7 +29,6 @@
 #  define  Perl_safesysrealloc		Perl_saferealloc
 #  define  Perl_set_numeric_local	perl_set_numeric_local
 #  define  Perl_set_numeric_standard	perl_set_numeric_standard
-#  define  PERL_POLLUTE
 /* malloc() pollution was the default in earlier versions, so enable
  * it for bincompat; but not for systems that used to do prevent that,
  * or when they ask for {HIDE,EMBED}MYMALLOC */
@@ -97,6 +96,7 @@
 #define die_nocontext		Perl_die_nocontext
 #define deb_nocontext		Perl_deb_nocontext
 #define form_nocontext		Perl_form_nocontext
+#define mess_nocontext		Perl_mess_nocontext
 #define warn_nocontext		Perl_warn_nocontext
 #define warner_nocontext	Perl_warner_nocontext
 #define newSVpvf_nocontext	Perl_newSVpvf_nocontext
@@ -364,6 +364,8 @@
 #define mem_collxfrm		Perl_mem_collxfrm
 #endif
 #define mess			Perl_mess
+#define vmess			Perl_vmess
+#define qerror			Perl_qerror
 #define mg_clear		Perl_mg_clear
 #define mg_copy			Perl_mg_copy
 #define mg_find			Perl_mg_find
@@ -945,14 +947,38 @@
 #define more_xiv		S_more_xiv
 #define more_xnv		S_more_xnv
 #define more_xpv		S_more_xpv
+#define more_xpviv		S_more_xpviv
+#define more_xpvnv		S_more_xpvnv
+#define more_xpvcv		S_more_xpvcv
+#define more_xpvav		S_more_xpvav
+#define more_xpvhv		S_more_xpvhv
+#define more_xpvmg		S_more_xpvmg
+#define more_xpvlv		S_more_xpvlv
+#define more_xpvbm		S_more_xpvbm
 #define more_xrv		S_more_xrv
 #define new_xiv			S_new_xiv
 #define new_xnv			S_new_xnv
 #define new_xpv			S_new_xpv
+#define new_xpviv		S_new_xpviv
+#define new_xpvnv		S_new_xpvnv
+#define new_xpvcv		S_new_xpvcv
+#define new_xpvav		S_new_xpvav
+#define new_xpvhv		S_new_xpvhv
+#define new_xpvmg		S_new_xpvmg
+#define new_xpvlv		S_new_xpvlv
+#define new_xpvbm		S_new_xpvbm
 #define new_xrv			S_new_xrv
 #define del_xiv			S_del_xiv
 #define del_xnv			S_del_xnv
 #define del_xpv			S_del_xpv
+#define del_xpviv		S_del_xpviv
+#define del_xpvnv		S_del_xpvnv
+#define del_xpvcv		S_del_xpvcv
+#define del_xpvav		S_del_xpvav
+#define del_xpvhv		S_del_xpvhv
+#define del_xpvmg		S_del_xpvmg
+#define del_xpvlv		S_del_xpvlv
+#define del_xpvbm		S_del_xpvbm
 #define del_xrv			S_del_xrv
 #define sv_unglob		S_sv_unglob
 #define not_a_number		S_not_a_number
@@ -1708,7 +1734,8 @@
 #if defined(USE_LOCALE_COLLATE)
 #define mem_collxfrm(a,b,c)	Perl_mem_collxfrm(aTHX_ a,b,c)
 #endif
-#define mess(a,b)		Perl_mess(aTHX_ a,b)
+#define vmess(a,b)		Perl_vmess(aTHX_ a,b)
+#define qerror(a)		Perl_qerror(aTHX_ a)
 #define mg_clear(a)		Perl_mg_clear(aTHX_ a)
 #define mg_copy(a,b,c,d)	Perl_mg_copy(aTHX_ a,b,c,d)
 #define mg_find(a,b)		Perl_mg_find(aTHX_ a,b)
@@ -2280,14 +2307,38 @@
 #define more_xiv()		S_more_xiv(aTHX)
 #define more_xnv()		S_more_xnv(aTHX)
 #define more_xpv()		S_more_xpv(aTHX)
+#define more_xpviv()		S_more_xpviv(aTHX)
+#define more_xpvnv()		S_more_xpvnv(aTHX)
+#define more_xpvcv()		S_more_xpvcv(aTHX)
+#define more_xpvav()		S_more_xpvav(aTHX)
+#define more_xpvhv()		S_more_xpvhv(aTHX)
+#define more_xpvmg()		S_more_xpvmg(aTHX)
+#define more_xpvlv()		S_more_xpvlv(aTHX)
+#define more_xpvbm()		S_more_xpvbm(aTHX)
 #define more_xrv()		S_more_xrv(aTHX)
 #define new_xiv()		S_new_xiv(aTHX)
 #define new_xnv()		S_new_xnv(aTHX)
 #define new_xpv()		S_new_xpv(aTHX)
+#define new_xpviv()		S_new_xpviv(aTHX)
+#define new_xpvnv()		S_new_xpvnv(aTHX)
+#define new_xpvcv()		S_new_xpvcv(aTHX)
+#define new_xpvav()		S_new_xpvav(aTHX)
+#define new_xpvhv()		S_new_xpvhv(aTHX)
+#define new_xpvmg()		S_new_xpvmg(aTHX)
+#define new_xpvlv()		S_new_xpvlv(aTHX)
+#define new_xpvbm()		S_new_xpvbm(aTHX)
 #define new_xrv()		S_new_xrv(aTHX)
 #define del_xiv(a)		S_del_xiv(aTHX_ a)
 #define del_xnv(a)		S_del_xnv(aTHX_ a)
 #define del_xpv(a)		S_del_xpv(aTHX_ a)
+#define del_xpviv(a)		S_del_xpviv(aTHX_ a)
+#define del_xpvnv(a)		S_del_xpvnv(aTHX_ a)
+#define del_xpvcv(a)		S_del_xpvcv(aTHX_ a)
+#define del_xpvav(a)		S_del_xpvav(aTHX_ a)
+#define del_xpvhv(a)		S_del_xpvhv(aTHX_ a)
+#define del_xpvmg(a)		S_del_xpvmg(aTHX_ a)
+#define del_xpvlv(a)		S_del_xpvlv(aTHX_ a)
+#define del_xpvbm(a)		S_del_xpvbm(aTHX_ a)
 #define del_xrv(a)		S_del_xrv(aTHX_ a)
 #define sv_unglob(a)		S_sv_unglob(aTHX_ a)
 #define not_a_number(a)		S_not_a_number(aTHX_ a)
@@ -2838,6 +2889,8 @@
 #define deb_nocontext		Perl_deb_nocontext
 #define Perl_form_nocontext	CPerlObj::Perl_form_nocontext
 #define form_nocontext		Perl_form_nocontext
+#define Perl_mess_nocontext	CPerlObj::Perl_mess_nocontext
+#define mess_nocontext		Perl_mess_nocontext
 #define Perl_warn_nocontext	CPerlObj::Perl_warn_nocontext
 #define warn_nocontext		Perl_warn_nocontext
 #define Perl_warner_nocontext	CPerlObj::Perl_warner_nocontext
@@ -3353,6 +3406,10 @@
 #endif
 #define Perl_mess		CPerlObj::Perl_mess
 #define mess			Perl_mess
+#define Perl_vmess		CPerlObj::Perl_vmess
+#define vmess			Perl_vmess
+#define Perl_qerror		CPerlObj::Perl_qerror
+#define qerror			Perl_qerror
 #define Perl_mg_clear		CPerlObj::Perl_mg_clear
 #define mg_clear		Perl_mg_clear
 #define Perl_mg_copy		CPerlObj::Perl_mg_copy
@@ -4457,6 +4514,22 @@
 #define more_xnv		S_more_xnv
 #define S_more_xpv		CPerlObj::S_more_xpv
 #define more_xpv		S_more_xpv
+#define S_more_xpviv		CPerlObj::S_more_xpviv
+#define more_xpviv		S_more_xpviv
+#define S_more_xpvnv		CPerlObj::S_more_xpvnv
+#define more_xpvnv		S_more_xpvnv
+#define S_more_xpvcv		CPerlObj::S_more_xpvcv
+#define more_xpvcv		S_more_xpvcv
+#define S_more_xpvav		CPerlObj::S_more_xpvav
+#define more_xpvav		S_more_xpvav
+#define S_more_xpvhv		CPerlObj::S_more_xpvhv
+#define more_xpvhv		S_more_xpvhv
+#define S_more_xpvmg		CPerlObj::S_more_xpvmg
+#define more_xpvmg		S_more_xpvmg
+#define S_more_xpvlv		CPerlObj::S_more_xpvlv
+#define more_xpvlv		S_more_xpvlv
+#define S_more_xpvbm		CPerlObj::S_more_xpvbm
+#define more_xpvbm		S_more_xpvbm
 #define S_more_xrv		CPerlObj::S_more_xrv
 #define more_xrv		S_more_xrv
 #define S_new_xiv		CPerlObj::S_new_xiv
@@ -4465,6 +4538,22 @@
 #define new_xnv			S_new_xnv
 #define S_new_xpv		CPerlObj::S_new_xpv
 #define new_xpv			S_new_xpv
+#define S_new_xpviv		CPerlObj::S_new_xpviv
+#define new_xpviv		S_new_xpviv
+#define S_new_xpvnv		CPerlObj::S_new_xpvnv
+#define new_xpvnv		S_new_xpvnv
+#define S_new_xpvcv		CPerlObj::S_new_xpvcv
+#define new_xpvcv		S_new_xpvcv
+#define S_new_xpvav		CPerlObj::S_new_xpvav
+#define new_xpvav		S_new_xpvav
+#define S_new_xpvhv		CPerlObj::S_new_xpvhv
+#define new_xpvhv		S_new_xpvhv
+#define S_new_xpvmg		CPerlObj::S_new_xpvmg
+#define new_xpvmg		S_new_xpvmg
+#define S_new_xpvlv		CPerlObj::S_new_xpvlv
+#define new_xpvlv		S_new_xpvlv
+#define S_new_xpvbm		CPerlObj::S_new_xpvbm
+#define new_xpvbm		S_new_xpvbm
 #define S_new_xrv		CPerlObj::S_new_xrv
 #define new_xrv			S_new_xrv
 #define S_del_xiv		CPerlObj::S_del_xiv
@@ -4473,6 +4562,22 @@
 #define del_xnv			S_del_xnv
 #define S_del_xpv		CPerlObj::S_del_xpv
 #define del_xpv			S_del_xpv
+#define S_del_xpviv		CPerlObj::S_del_xpviv
+#define del_xpviv		S_del_xpviv
+#define S_del_xpvnv		CPerlObj::S_del_xpvnv
+#define del_xpvnv		S_del_xpvnv
+#define S_del_xpvcv		CPerlObj::S_del_xpvcv
+#define del_xpvcv		S_del_xpvcv
+#define S_del_xpvav		CPerlObj::S_del_xpvav
+#define del_xpvav		S_del_xpvav
+#define S_del_xpvhv		CPerlObj::S_del_xpvhv
+#define del_xpvhv		S_del_xpvhv
+#define S_del_xpvmg		CPerlObj::S_del_xpvmg
+#define del_xpvmg		S_del_xpvmg
+#define S_del_xpvlv		CPerlObj::S_del_xpvlv
+#define del_xpvlv		S_del_xpvlv
+#define S_del_xpvbm		CPerlObj::S_del_xpvbm
+#define del_xpvbm		S_del_xpvbm
 #define S_del_xrv		CPerlObj::S_del_xrv
 #define del_xrv			S_del_xrv
 #define S_sv_unglob		CPerlObj::S_sv_unglob
@@ -5405,6 +5510,7 @@
 #  define deb				Perl_deb_nocontext
 #  define die				Perl_die_nocontext
 #  define form				Perl_form_nocontext
+#  define mess				Perl_mess_nocontext
 #  define newSVpvf			Perl_newSVpvf_nocontext
 #  define sv_catpvf			Perl_sv_catpvf_nocontext
 #  define sv_setpvf			Perl_sv_setpvf_nocontext
@@ -5422,6 +5528,7 @@
 #  define Perl_die_nocontext		Perl_die
 #  define Perl_deb_nocontext		Perl_deb
 #  define Perl_form_nocontext		Perl_form
+#  define Perl_mess_nocontext		Perl_mess
 #  define Perl_newSVpvf_nocontext	Perl_newSVpvf
 #  define Perl_sv_catpvf_nocontext	Perl_sv_catpvf
 #  define Perl_sv_setpvf_nocontext	Perl_sv_setpvf