With Damian's approval synchronize damian's modules'

[p5sagit/p5-mst-13.2.git] / embed.h

diff --git a/embed.h b/embed.h
index 6d2eea6..83afb92 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -131,6 +131,7 @@
 #define sv_catpvf_mg_nocontext Perl_sv_catpvf_mg_nocontext
 #define sv_setpvf_mg_nocontext Perl_sv_setpvf_mg_nocontext
 #define fprintf_nocontext      Perl_fprintf_nocontext
+#define printf_nocontext       Perl_printf_nocontext
 #endif
 #define cv_ckproto             Perl_cv_ckproto
 #define cv_clone               Perl_cv_clone
@@ -698,6 +699,7 @@
 #define sv_setuv               Perl_sv_setuv
 #define sv_setnv               Perl_sv_setnv
 #define sv_setref_iv           Perl_sv_setref_iv
+#define sv_setref_uv           Perl_sv_setref_uv
 #define sv_setref_nv           Perl_sv_setref_nv
 #define sv_setref_pv           Perl_sv_setref_pv
 #define sv_setref_pvn          Perl_sv_setref_pvn
@@ -739,9 +741,12 @@
 #define utf8_to_bytes          Perl_utf8_to_bytes
 #define bytes_from_utf8                Perl_bytes_from_utf8
 #define bytes_to_utf8          Perl_bytes_to_utf8
-#define utf8_to_uv_simple      Perl_utf8_to_uv_simple
-#define utf8_to_uv             Perl_utf8_to_uv
-#define uv_to_utf8             Perl_uv_to_utf8
+#define utf8_to_uvchr          Perl_utf8_to_uvchr
+#define utf8_to_uvuni          Perl_utf8_to_uvuni
+#define utf8n_to_uvchr         Perl_utf8n_to_uvchr
+#define utf8n_to_uvuni         Perl_utf8n_to_uvuni
+#define uvchr_to_utf8          Perl_uvchr_to_utf8
+#define uvuni_to_utf8          Perl_uvuni_to_utf8
 #define vivify_defelem         Perl_vivify_defelem
 #define vivify_ref             Perl_vivify_ref
 #define wait4pid               Perl_wait4pid
@@ -846,7 +851,6 @@
 #define gp_dup                 Perl_gp_dup
 #define mg_dup                 Perl_mg_dup
 #define sv_dup                 Perl_sv_dup
-#define gv_share               S_gv_share
 #if defined(HAVE_INTERP_INTERN)
 #define sys_intern_dup         Perl_sys_intern_dup
 #endif
@@ -913,7 +917,9 @@
 #define simplify_sort          S_simplify_sort
 #define is_handle_constructor  S_is_handle_constructor
 #define gv_ename               S_gv_ename
+#  if defined(DEBUG_CLOSURES)
 #define cv_dump                        S_cv_dump
+#  endif
 #define cv_clone2              S_cv_clone2
 #define scalar_mod_type                S_scalar_mod_type
 #define my_kid                 S_my_kid
@@ -977,7 +983,6 @@
 #define dopoptoloop            S_dopoptoloop
 #define dopoptosub             S_dopoptosub
 #define dopoptosub_at          S_dopoptosub_at
-#define free_closures          S_free_closures
 #define save_lines             S_save_lines
 #define doeval                 S_doeval
 #define doopen_pmc             S_doopen_pmc
@@ -1101,6 +1106,9 @@
 #define sv_2iuv_non_preserve   S_sv_2iuv_non_preserve
 #  endif
 #define expect_number          S_expect_number
+#  if defined(USE_ITHREADS)
+#define gv_share               S_gv_share
+#  endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
 #define check_uni              S_check_uni
@@ -2179,6 +2187,7 @@
 #define sv_setuv(a,b)          Perl_sv_setuv(aTHX_ a,b)
 #define sv_setnv(a,b)          Perl_sv_setnv(aTHX_ a,b)
 #define sv_setref_iv(a,b,c)    Perl_sv_setref_iv(aTHX_ a,b,c)
+#define sv_setref_uv(a,b,c)    Perl_sv_setref_uv(aTHX_ a,b,c)
 #define sv_setref_nv(a,b,c)    Perl_sv_setref_nv(aTHX_ a,b,c)
 #define sv_setref_pv(a,b,c)    Perl_sv_setref_pv(aTHX_ a,b,c)
 #define sv_setref_pvn(a,b,c,d) Perl_sv_setref_pvn(aTHX_ a,b,c,d)
@@ -2220,9 +2229,12 @@
 #define utf8_to_bytes(a,b)     Perl_utf8_to_bytes(aTHX_ a,b)
 #define bytes_from_utf8(a,b,c) Perl_bytes_from_utf8(aTHX_ a,b,c)
 #define bytes_to_utf8(a,b)     Perl_bytes_to_utf8(aTHX_ a,b)
-#define utf8_to_uv_simple(a,b) Perl_utf8_to_uv_simple(aTHX_ a,b)
-#define utf8_to_uv(a,b,c,d)    Perl_utf8_to_uv(aTHX_ a,b,c,d)
-#define uv_to_utf8(a,b)                Perl_uv_to_utf8(aTHX_ a,b)
+#define utf8_to_uvchr(a,b)     Perl_utf8_to_uvchr(aTHX_ a,b)
+#define utf8_to_uvuni(a,b)     Perl_utf8_to_uvuni(aTHX_ a,b)
+#define utf8n_to_uvchr(a,b,c,d)        Perl_utf8n_to_uvchr(aTHX_ a,b,c,d)
+#define utf8n_to_uvuni(a,b,c,d)        Perl_utf8n_to_uvuni(aTHX_ a,b,c,d)
+#define uvchr_to_utf8(a,b)     Perl_uvchr_to_utf8(aTHX_ a,b)
+#define uvuni_to_utf8(a,b)     Perl_uvuni_to_utf8(aTHX_ a,b)
 #define vivify_defelem(a)      Perl_vivify_defelem(aTHX_ a)
 #define vivify_ref(a,b)                Perl_vivify_ref(aTHX_ a,b)
 #define wait4pid(a,b,c)                Perl_wait4pid(aTHX_ a,b,c)
@@ -2321,7 +2333,6 @@
 #define gp_dup(a)              Perl_gp_dup(aTHX_ a)
 #define mg_dup(a)              Perl_mg_dup(aTHX_ a)
 #define sv_dup(a)              Perl_sv_dup(aTHX_ a)
-#define gv_share(a)            S_gv_share(aTHX_ a)
 #if defined(HAVE_INTERP_INTERN)
 #define sys_intern_dup(a,b)    Perl_sys_intern_dup(aTHX_ a,b)
 #endif
@@ -2388,7 +2399,9 @@
 #define simplify_sort(a)       S_simplify_sort(aTHX_ a)
 #define is_handle_constructor(a,b)     S_is_handle_constructor(aTHX_ a,b)
 #define gv_ename(a)            S_gv_ename(aTHX_ a)
+#  if defined(DEBUG_CLOSURES)
 #define cv_dump(a)             S_cv_dump(aTHX_ a)
+#  endif
 #define cv_clone2(a,b)         S_cv_clone2(aTHX_ a,b)
 #define scalar_mod_type(a,b)   S_scalar_mod_type(aTHX_ a,b)
 #define my_kid(a,b)            S_my_kid(aTHX_ a,b)
@@ -2452,7 +2465,6 @@
 #define dopoptoloop(a)         S_dopoptoloop(aTHX_ a)
 #define dopoptosub(a)          S_dopoptosub(aTHX_ a)
 #define dopoptosub_at(a,b)     S_dopoptosub_at(aTHX_ a,b)
-#define free_closures()                S_free_closures(aTHX)
 #define save_lines(a,b)                S_save_lines(aTHX_ a,b)
 #define doeval(a,b)            S_doeval(aTHX_ a,b)
 #define doopen_pmc(a,b)                S_doopen_pmc(aTHX_ a,b)
@@ -2575,6 +2587,9 @@
 #define sv_2iuv_non_preserve(a,b)      S_sv_2iuv_non_preserve(aTHX_ a,b)
 #  endif
 #define expect_number(a)       S_expect_number(aTHX_ a)
+#  if defined(USE_ITHREADS)
+#define gv_share(a)            S_gv_share(aTHX_ a)
+#  endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
 #define check_uni()            S_check_uni(aTHX)
@@ -3174,6 +3189,8 @@
 #define sv_setpvf_mg_nocontext Perl_sv_setpvf_mg_nocontext
 #define Perl_fprintf_nocontext CPerlObj::Perl_fprintf_nocontext
 #define fprintf_nocontext      Perl_fprintf_nocontext
+#define Perl_printf_nocontext  CPerlObj::Perl_printf_nocontext
+#define printf_nocontext       Perl_printf_nocontext
 #endif
 #define Perl_cv_ckproto                CPerlObj::Perl_cv_ckproto
 #define cv_ckproto             Perl_cv_ckproto
@@ -4276,6 +4293,8 @@
 #define sv_setnv               Perl_sv_setnv
 #define Perl_sv_setref_iv      CPerlObj::Perl_sv_setref_iv
 #define sv_setref_iv           Perl_sv_setref_iv
+#define Perl_sv_setref_uv      CPerlObj::Perl_sv_setref_uv
+#define sv_setref_uv           Perl_sv_setref_uv
 #define Perl_sv_setref_nv      CPerlObj::Perl_sv_setref_nv
 #define sv_setref_nv           Perl_sv_setref_nv
 #define Perl_sv_setref_pv      CPerlObj::Perl_sv_setref_pv
@@ -4354,12 +4373,18 @@
 #define bytes_from_utf8                Perl_bytes_from_utf8
 #define Perl_bytes_to_utf8     CPerlObj::Perl_bytes_to_utf8
 #define bytes_to_utf8          Perl_bytes_to_utf8
-#define Perl_utf8_to_uv_simple CPerlObj::Perl_utf8_to_uv_simple
-#define utf8_to_uv_simple      Perl_utf8_to_uv_simple
-#define Perl_utf8_to_uv                CPerlObj::Perl_utf8_to_uv
-#define utf8_to_uv             Perl_utf8_to_uv
-#define Perl_uv_to_utf8                CPerlObj::Perl_uv_to_utf8
-#define uv_to_utf8             Perl_uv_to_utf8
+#define Perl_utf8_to_uvchr     CPerlObj::Perl_utf8_to_uvchr
+#define utf8_to_uvchr          Perl_utf8_to_uvchr
+#define Perl_utf8_to_uvuni     CPerlObj::Perl_utf8_to_uvuni
+#define utf8_to_uvuni          Perl_utf8_to_uvuni
+#define Perl_utf8n_to_uvchr    CPerlObj::Perl_utf8n_to_uvchr
+#define utf8n_to_uvchr         Perl_utf8n_to_uvchr
+#define Perl_utf8n_to_uvuni    CPerlObj::Perl_utf8n_to_uvuni
+#define utf8n_to_uvuni         Perl_utf8n_to_uvuni
+#define Perl_uvchr_to_utf8     CPerlObj::Perl_uvchr_to_utf8
+#define uvchr_to_utf8          Perl_uvchr_to_utf8
+#define Perl_uvuni_to_utf8     CPerlObj::Perl_uvuni_to_utf8
+#define uvuni_to_utf8          Perl_uvuni_to_utf8
 #define Perl_vivify_defelem    CPerlObj::Perl_vivify_defelem
 #define vivify_defelem         Perl_vivify_defelem
 #define Perl_vivify_ref                CPerlObj::Perl_vivify_ref
@@ -4555,8 +4580,6 @@
 #define mg_dup                 Perl_mg_dup
 #define Perl_sv_dup            CPerlObj::Perl_sv_dup
 #define sv_dup                 Perl_sv_dup
-#define S_gv_share             CPerlObj::S_gv_share
-#define gv_share               S_gv_share
 #if defined(HAVE_INTERP_INTERN)
 #define Perl_sys_intern_dup    CPerlObj::Perl_sys_intern_dup
 #define sys_intern_dup         Perl_sys_intern_dup
@@ -4670,8 +4693,10 @@
 #define is_handle_constructor  S_is_handle_constructor
 #define S_gv_ename             CPerlObj::S_gv_ename
 #define gv_ename               S_gv_ename
+#  if defined(DEBUG_CLOSURES)
 #define S_cv_dump              CPerlObj::S_cv_dump
 #define cv_dump                        S_cv_dump
+#  endif
 #define S_cv_clone2            CPerlObj::S_cv_clone2
 #define cv_clone2              S_cv_clone2
 #define S_scalar_mod_type      CPerlObj::S_scalar_mod_type
@@ -4782,8 +4807,6 @@
 #define dopoptosub             S_dopoptosub
 #define S_dopoptosub_at                CPerlObj::S_dopoptosub_at
 #define dopoptosub_at          S_dopoptosub_at
-#define S_free_closures                CPerlObj::S_free_closures
-#define free_closures          S_free_closures
 #define S_save_lines           CPerlObj::S_save_lines
 #define save_lines             S_save_lines
 #define S_doeval               CPerlObj::S_doeval
@@ -5010,6 +5033,10 @@
 #  endif
 #define S_expect_number                CPerlObj::S_expect_number
 #define expect_number          S_expect_number
+#  if defined(USE_ITHREADS)
+#define S_gv_share             CPerlObj::S_gv_share
+#define gv_share               S_gv_share
+#  endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
 #define S_check_uni            CPerlObj::S_check_uni