X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=8dd9b609761dfba8f7039f0a6e7cdf9d821b986b;hb=696235b60874be65fe029a39969f44a0133ec2f8;hp=cda99dcbc2617e98ab52e23cb40e2032e25db01a;hpb=10bc17b68c7666cd045658934ccb75dd788c8972;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/embed.h b/embed.h
index cda99dc..8dd9b60 100644
--- a/embed.h
+++ b/embed.h
@@ -537,6 +537,7 @@
 #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
@@ -854,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
@@ -1078,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
@@ -1088,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
@@ -1196,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
@@ -2407,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)
@@ -2629,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)
@@ -2640,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)
@@ -2748,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