X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=57deaf092e2c1cfc35dc11e47e9c87283c2101f2;hb=62703e7218aceb3f5d30f70a2307dd02e5eb8c63;hp=9d22e8d0631a557814cdb71f878f87013a02eb20;hpb=2e0de35c58680e1e008b1d014c5b9ccec5b78282;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/embed.h b/embed.h
index 9d22e8d..57deaf0 100644
--- a/embed.h
+++ b/embed.h
@@ -2,7 +2,7 @@
  *    embed.h
  *
  *    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- *    2000, 2001, 2002, 2003, 2004, by Larry Wall and others
+ *    2000, 2001, 2002, 2003, 2004, 2005, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -1183,10 +1183,6 @@
 #define do_pmop_dump		Perl_do_pmop_dump
 #define do_sv_dump		Perl_do_sv_dump
 #define magic_dump		Perl_magic_dump
-#if defined(PERL_FLEXIBLE_EXCEPTIONS)
-#define default_protect		Perl_default_protect
-#define vdefault_protect	Perl_vdefault_protect
-#endif
 #define reginitcolors		Perl_reginitcolors
 #define sv_2pv_nolen		Perl_sv_2pv_nolen
 #define sv_2pvutf8_nolen	Perl_sv_2pvutf8_nolen
@@ -1222,6 +1218,7 @@
 #define gp_dup			Perl_gp_dup
 #define mg_dup			Perl_mg_dup
 #define sv_dup			Perl_sv_dup
+#define rvpv_dup		Perl_rvpv_dup
 #if defined(HAVE_INTERP_INTERN)
 #define sys_intern_dup		Perl_sys_intern_dup
 #endif
@@ -1444,20 +1441,6 @@
 #ifdef PERL_CORE
 #define call_list_body		S_call_list_body
 #endif
-#if defined(PERL_FLEXIBLE_EXCEPTIONS)
-#ifdef PERL_CORE
-#define vparse_body		S_vparse_body
-#endif
-#ifdef PERL_CORE
-#define vrun_body		S_vrun_body
-#endif
-#ifdef PERL_CORE
-#define vcall_body		S_vcall_body
-#endif
-#ifdef PERL_CORE
-#define vcall_list_body		S_vcall_list_body
-#endif
-#endif
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
@@ -1487,9 +1470,6 @@
 #define next_symbol		S_next_symbol
 #endif
 #ifdef PERL_CORE
-#define doencodes		S_doencodes
-#endif
-#ifdef PERL_CORE
 #define is_an_int		S_is_an_int
 #endif
 #ifdef PERL_CORE
@@ -1503,11 +1483,6 @@
 #ifdef PERL_CORE
 #define docatch_body		S_docatch_body
 #endif
-#if defined(PERL_FLEXIBLE_EXCEPTIONS)
-#ifdef PERL_CORE
-#define vdocatch_body		S_vdocatch_body
-#endif
-#endif
 #ifdef PERL_CORE
 #define dofindlabel		S_dofindlabel
 #endif
@@ -1656,6 +1631,9 @@
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define checkposixcc		S_checkposixcc
 #endif
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#define make_trie		S_make_trie
+#endif
 #endif
 #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT)
 #if defined(PERL_CORE) || defined(PERL_EXT)
@@ -3806,9 +3784,6 @@
 #define do_pmop_dump(a,b,c)	Perl_do_pmop_dump(aTHX_ a,b,c)
 #define do_sv_dump(a,b,c,d,e,f,g)	Perl_do_sv_dump(aTHX_ a,b,c,d,e,f,g)
 #define magic_dump(a)		Perl_magic_dump(aTHX_ a)
-#if defined(PERL_FLEXIBLE_EXCEPTIONS)
-#define vdefault_protect(a,b,c,d)	Perl_vdefault_protect(aTHX_ a,b,c,d)
-#endif
 #define reginitcolors()		Perl_reginitcolors(aTHX)
 #define sv_2pv_nolen(a)		Perl_sv_2pv_nolen(aTHX_ a)
 #define sv_2pvutf8_nolen(a)	Perl_sv_2pvutf8_nolen(aTHX_ a)
@@ -3844,6 +3819,7 @@
 #define gp_dup(a,b)		Perl_gp_dup(aTHX_ a,b)
 #define mg_dup(a,b)		Perl_mg_dup(aTHX_ a,b)
 #define sv_dup(a,b)		Perl_sv_dup(aTHX_ a,b)
+#define rvpv_dup(a,b,c)		Perl_rvpv_dup(aTHX_ a,b,c)
 #if defined(HAVE_INTERP_INTERN)
 #define sys_intern_dup(a,b)	Perl_sys_intern_dup(aTHX_ a,b)
 #endif
@@ -4066,20 +4042,6 @@
 #ifdef PERL_CORE
 #define call_list_body(a)	S_call_list_body(aTHX_ a)
 #endif
-#if defined(PERL_FLEXIBLE_EXCEPTIONS)
-#ifdef PERL_CORE
-#define vparse_body(a)		S_vparse_body(aTHX_ a)
-#endif
-#ifdef PERL_CORE
-#define vrun_body(a)		S_vrun_body(aTHX_ a)
-#endif
-#ifdef PERL_CORE
-#define vcall_body(a)		S_vcall_body(aTHX_ a)
-#endif
-#ifdef PERL_CORE
-#define vcall_list_body(a)	S_vcall_list_body(aTHX_ a)
-#endif
-#endif
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
@@ -4109,9 +4071,6 @@
 #define next_symbol(a)		S_next_symbol(aTHX_ a)
 #endif
 #ifdef PERL_CORE
-#define doencodes(a,b,c)	S_doencodes(aTHX_ a,b,c)
-#endif
-#ifdef PERL_CORE
 #define is_an_int(a,b)		S_is_an_int(aTHX_ a,b)
 #endif
 #ifdef PERL_CORE
@@ -4125,11 +4084,6 @@
 #ifdef PERL_CORE
 #define docatch_body()		S_docatch_body(aTHX)
 #endif
-#if defined(PERL_FLEXIBLE_EXCEPTIONS)
-#ifdef PERL_CORE
-#define vdocatch_body(a)	S_vdocatch_body(aTHX_ a)
-#endif
-#endif
 #ifdef PERL_CORE
 #define dofindlabel(a,b,c,d)	S_dofindlabel(aTHX_ a,b,c,d)
 #endif
@@ -4264,7 +4218,7 @@
 #define cl_or(a,b,c)		S_cl_or(aTHX_ a,b,c)
 #endif
 #if defined(PERL_CORE) || defined(PERL_EXT)
-#define study_chunk(a,b,c,d,e,f)	S_study_chunk(aTHX_ a,b,c,d,e,f)
+#define study_chunk(a,b,c,d,e,f,g)	S_study_chunk(aTHX_ a,b,c,d,e,f,g)
 #endif
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define add_data(a,b,c)		S_add_data(aTHX_ a,b,c)
@@ -4277,6 +4231,9 @@
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define checkposixcc(a)		S_checkposixcc(aTHX_ a)
 #endif
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#define make_trie(a,b,c,d,e,f)	S_make_trie(aTHX_ a,b,c,d,e,f)
+#endif
 #endif
 #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT)
 #if defined(PERL_CORE) || defined(PERL_EXT)
@@ -4319,7 +4276,7 @@
 #define reghopmaybe3(a,b,c)	S_reghopmaybe3(aTHX_ a,b,c)
 #endif
 #if defined(PERL_CORE) || defined(PERL_EXT)
-#define find_byclass(a,b,c,d,e,f)	S_find_byclass(aTHX_ a,b,c,d,e,f)
+#define find_byclass(a,b,c,d,e)	S_find_byclass(aTHX_ a,b,c,d,e)
 #endif
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define to_utf8_substr(a)	S_to_utf8_substr(aTHX_ a)
@@ -4734,7 +4691,7 @@
 #define pad_fixup_inner_anons(a,b,c)	Perl_pad_fixup_inner_anons(aTHX_ a,b,c)
 #endif
 #ifdef PERL_CORE
-#define pad_push(a,b,c)		Perl_pad_push(aTHX_ a,b,c)
+#define pad_push(a,b)		Perl_pad_push(aTHX_ a,b)
 #endif
 #if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE