integrate utfperl contents into mainline

p4raw-id: //depot/perl@4726

diff --git a/global.sym b/global.sym
index 4199328..2cb0e11 100644 (file)
--- a/global.sym
+++ b/global.sym
@@ -520,15 +520,11 @@ Perl_sv_2iv
 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
@@ -568,8 +564,6 @@ Perl_sv_peek
 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
@@ -672,11 +666,7 @@ Perl_default_protect
 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 --git a/perl.h b/perl.h
index 2bba6d4..98c6265 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -1470,10 +1470,6 @@ typedef struct ptr_tbl PTR_TBL_t;
 #  define PERL_SYS_INIT3(argvp,argcp,envp) PERL_SYS_INIT(argvp,argcp)
 #endif
 
-#ifndef PERL_SYS_INIT3
-#  define PERL_SYS_INIT3(argvp,argcp,envp) PERL_SYS_INIT(argvp,argcp)
-#endif
-
 #ifndef MAXPATHLEN
 #  ifdef PATH_MAX
 #    ifdef _POSIX_PATH_MAX

diff --git a/sv.h b/sv.h
index 1374c87..b6e819f 100644 (file)
--- a/sv.h
+++ b/sv.h
@@ -158,6 +158,8 @@ struct io {
 
 #define SVpad_OUR      0x80000000      /* pad name is "our" instead of "my" */
 
+#define SVpad_OUR      0x80000000      /* pad name is "our" instead of "my" */
+
 #define SVf_IVisUV     0x80000000      /* use XPVUV instead of XPVIV */
 
 #define SVpfm_COMPILED 0x80000000      /* FORMLINE is compiled */