As verified by Doug MacEachern.

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

diff --git a/embed.h b/embed.h
index d7e137a..8dd9b60 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -157,6 +157,7 @@
 #define debstackptrs           Perl_debstackptrs
 #define delimcpy               Perl_delimcpy
 #define deprecate              Perl_deprecate
+#define deprecate_old          Perl_deprecate_old
 #define die                    Perl_die
 #define vdie                   Perl_vdie
 #define die_where              Perl_die_where
@@ -237,6 +238,7 @@
 #define gv_efullname4          Perl_gv_efullname4
 #define gv_fetchfile           Perl_gv_fetchfile
 #define gv_fetchmeth           Perl_gv_fetchmeth
+#define gv_fetchmeth_autoload  Perl_gv_fetchmeth_autoload
 #define gv_fetchmethod         Perl_gv_fetchmethod
 #define gv_fetchmethod_autoload        Perl_gv_fetchmethod_autoload
 #define gv_fetchpv             Perl_gv_fetchpv
@@ -531,6 +533,12 @@
 #if defined(USE_5005THREADS)
 #define new_struct_thread      Perl_new_struct_thread
 #endif
+#if defined(USE_REENTRANT_API)
+#define reentrant_size         Perl_reentrant_size
+#define reentrant_init         Perl_reentrant_init
+#define reentrant_free         Perl_reentrant_free
+#define reentrant_retry                Perl_reentrant_retry
+#endif
 #define call_atexit            Perl_call_atexit
 #define call_argv              Perl_call_argv
 #define call_method            Perl_call_method
@@ -847,9 +855,6 @@
 #define sv_2pv_nolen           Perl_sv_2pv_nolen
 #define sv_2pvutf8_nolen       Perl_sv_2pvutf8_nolen
 #define sv_2pvbyte_nolen       Perl_sv_2pvbyte_nolen
-#define sv_pv                  Perl_sv_pv
-#define sv_pvutf8              Perl_sv_pvutf8
-#define sv_pvbyte              Perl_sv_pvbyte
 #define sv_utf8_downgrade      Perl_sv_utf8_downgrade
 #define sv_utf8_encode         Perl_sv_utf8_encode
 #define sv_utf8_decode         Perl_sv_utf8_decode
@@ -1071,7 +1076,6 @@
 #define regrepeat_hard         S_regrepeat_hard
 #define regtry                 S_regtry
 #define reginclass             S_reginclass
-#define reginclasslen          S_reginclasslen
 #define regcppush              S_regcppush
 #define regcppop               S_regcppop
 #define regcp_set_to           S_regcp_set_to
@@ -1081,6 +1085,8 @@
 #define reghopmaybe            S_reghopmaybe
 #define reghopmaybe3           S_reghopmaybe3
 #define find_byclass           S_find_byclass
+#define to_utf8_substr         S_to_utf8_substr
+#define to_byte_substr         S_to_byte_substr
 #endif
 #if defined(PERL_IN_DUMP_C) || defined(PERL_DECL_PROT)
 #define deb_curcv              S_deb_curcv
@@ -1189,9 +1195,6 @@
 #define utf16_textfilter       S_utf16_textfilter
 #define utf16rev_textfilter    S_utf16rev_textfilter
 #endif
-#  if defined(CRIPPLED_CC)
-#define uni                    S_uni
-#  endif
 #  if defined(PERL_CR_FILTER)
 #define cr_textfilter          S_cr_textfilter
 #  endif
@@ -1215,6 +1218,7 @@
 #define sv_utf8_upgrade_flags  Perl_sv_utf8_upgrade_flags
 #define sv_pvn_force_flags     Perl_sv_pvn_force_flags
 #define sv_2pv_flags           Perl_sv_2pv_flags
+#define sv_copypv              Perl_sv_copypv
 #define my_atof2               Perl_my_atof2
 #define my_socketpair          Perl_my_socketpair
 #if defined(USE_PERLIO) && !defined(USE_SFIO)
@@ -1715,6 +1719,7 @@
 #define debstackptrs()         Perl_debstackptrs(aTHX)
 #define delimcpy(a,b,c,d,e,f)  Perl_delimcpy(aTHX_ a,b,c,d,e,f)
 #define deprecate(a)           Perl_deprecate(aTHX_ a)
+#define deprecate_old(a)       Perl_deprecate_old(aTHX_ a)
 #define vdie(a,b)              Perl_vdie(aTHX_ a,b)
 #define die_where(a,b)         Perl_die_where(aTHX_ a,b)
 #define dounwind(a)            Perl_dounwind(aTHX_ a)
@@ -1793,6 +1798,7 @@
 #define gv_efullname4(a,b,c,d) Perl_gv_efullname4(aTHX_ a,b,c,d)
 #define gv_fetchfile(a)                Perl_gv_fetchfile(aTHX_ a)
 #define gv_fetchmeth(a,b,c,d)  Perl_gv_fetchmeth(aTHX_ a,b,c,d)
+#define gv_fetchmeth_autoload(a,b,c,d) Perl_gv_fetchmeth_autoload(aTHX_ a,b,c,d)
 #define gv_fetchmethod(a,b)    Perl_gv_fetchmethod(aTHX_ a,b)
 #define gv_fetchmethod_autoload(a,b,c) Perl_gv_fetchmethod_autoload(aTHX_ a,b,c)
 #define gv_fetchpv(a,b,c)      Perl_gv_fetchpv(aTHX_ a,b,c)
@@ -2084,6 +2090,11 @@
 #if defined(USE_5005THREADS)
 #define new_struct_thread(a)   Perl_new_struct_thread(aTHX_ a)
 #endif
+#if defined(USE_REENTRANT_API)
+#define reentrant_size()       Perl_reentrant_size(aTHX)
+#define reentrant_init()       Perl_reentrant_init(aTHX)
+#define reentrant_free()       Perl_reentrant_free(aTHX)
+#endif
 #define call_atexit(a,b)       Perl_call_atexit(aTHX_ a,b)
 #define call_argv(a,b,c)       Perl_call_argv(aTHX_ a,b,c)
 #define call_method(a,b)       Perl_call_method(aTHX_ a,b)
@@ -2392,9 +2403,6 @@
 #define sv_2pv_nolen(a)                Perl_sv_2pv_nolen(aTHX_ a)
 #define sv_2pvutf8_nolen(a)    Perl_sv_2pvutf8_nolen(aTHX_ a)
 #define sv_2pvbyte_nolen(a)    Perl_sv_2pvbyte_nolen(aTHX_ a)
-#define sv_pv(a)               Perl_sv_pv(aTHX_ a)
-#define sv_pvutf8(a)           Perl_sv_pvutf8(aTHX_ a)
-#define sv_pvbyte(a)           Perl_sv_pvbyte(aTHX_ a)
 #define sv_utf8_downgrade(a,b) Perl_sv_utf8_downgrade(aTHX_ a,b)
 #define sv_utf8_encode(a)      Perl_sv_utf8_encode(aTHX_ a)
 #define sv_utf8_decode(a)      Perl_sv_utf8_decode(aTHX_ a)
@@ -2614,8 +2622,7 @@
 #define regrepeat(a,b)         S_regrepeat(aTHX_ a,b)
 #define regrepeat_hard(a,b,c)  S_regrepeat_hard(aTHX_ a,b,c)
 #define regtry(a,b)            S_regtry(aTHX_ a,b)
-#define reginclass(a,b,c)      S_reginclass(aTHX_ a,b,c)
-#define reginclasslen(a,b,c,d) S_reginclasslen(aTHX_ a,b,c,d)
+#define reginclass(a,b,c,d)    S_reginclass(aTHX_ a,b,c,d)
 #define regcppush(a)           S_regcppush(aTHX_ a)
 #define regcppop()             S_regcppop(aTHX)
 #define regcp_set_to(a)                S_regcp_set_to(aTHX_ a)
@@ -2625,6 +2632,8 @@
 #define reghopmaybe(a,b)       S_reghopmaybe(aTHX_ a,b)
 #define reghopmaybe3(a,b,c)    S_reghopmaybe3(aTHX_ a,b,c)
 #define find_byclass(a,b,c,d,e,f)      S_find_byclass(aTHX_ a,b,c,d,e,f)
+#define to_utf8_substr(a)      S_to_utf8_substr(aTHX_ a)
+#define to_byte_substr(a)      S_to_byte_substr(aTHX_ a)
 #endif
 #if defined(PERL_IN_DUMP_C) || defined(PERL_DECL_PROT)
 #define deb_curcv(a)           S_deb_curcv(aTHX_ a)
@@ -2733,9 +2742,6 @@
 #define utf16_textfilter(a,b,c)        S_utf16_textfilter(aTHX_ a,b,c)
 #define utf16rev_textfilter(a,b,c)     S_utf16rev_textfilter(aTHX_ a,b,c)
 #endif
-#  if defined(CRIPPLED_CC)
-#define uni(a,b)               S_uni(aTHX_ a,b)
-#  endif
 #  if defined(PERL_CR_FILTER)
 #define cr_textfilter(a,b,c)   S_cr_textfilter(aTHX_ a,b,c)
 #  endif
@@ -2759,6 +2765,7 @@
 #define sv_utf8_upgrade_flags(a,b)     Perl_sv_utf8_upgrade_flags(aTHX_ a,b)
 #define sv_pvn_force_flags(a,b,c)      Perl_sv_pvn_force_flags(aTHX_ a,b,c)
 #define sv_2pv_flags(a,b,c)    Perl_sv_2pv_flags(aTHX_ a,b,c)
+#define sv_copypv(a,b)         Perl_sv_copypv(aTHX_ a,b)
 #define my_atof2(a,b)          Perl_my_atof2(aTHX_ a,b)
 #define my_socketpair          Perl_my_socketpair
 #if defined(USE_PERLIO) && !defined(USE_SFIO)