X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=57deaf092e2c1cfc35dc11e47e9c87283c2101f2;hb=62703e7218aceb3f5d30f70a2307dd02e5eb8c63;hp=ffa67c1fd6bceee7c34ff69690b18ae5592ca53b;hpb=bbf60fe61b01cdf81488be8df998a73605e38931;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embed.h b/embed.h index ffa67c1..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. @@ -307,7 +307,6 @@ #define gv_autoload4 Perl_gv_autoload4 #define gv_check Perl_gv_check #define gv_efullname Perl_gv_efullname -#define gv_efullname3 Perl_gv_efullname3 #define gv_efullname4 Perl_gv_efullname4 #define gv_fetchfile Perl_gv_fetchfile #define gv_fetchmeth Perl_gv_fetchmeth @@ -316,7 +315,6 @@ #define gv_fetchmethod_autoload Perl_gv_fetchmethod_autoload #define gv_fetchpv Perl_gv_fetchpv #define gv_fullname Perl_gv_fullname -#define gv_fullname3 Perl_gv_fullname3 #define gv_fullname4 Perl_gv_fullname4 #define gv_init Perl_gv_init #define gv_stashpv Perl_gv_stashpv @@ -443,6 +441,8 @@ #ifdef PERL_CORE #define op_clear Perl_op_clear #endif +#define op_refcnt_lock Perl_op_refcnt_lock +#define op_refcnt_unlock Perl_op_refcnt_unlock #ifdef PERL_CORE #define linklist Perl_linklist #endif @@ -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) @@ -2278,6 +2256,12 @@ #ifdef PERL_CORE #define my_swabn Perl_my_swabn #endif +#define gv_fetchpvn_flags Perl_gv_fetchpvn_flags +#define gv_fetchsv Perl_gv_fetchsv +#ifdef PERL_CORE +#define is_gv_magical_sv Perl_is_gv_magical_sv +#endif +#define savesvpv Perl_savesvpv #define ck_anoncode Perl_ck_anoncode #define ck_bitop Perl_ck_bitop #define ck_concat Perl_ck_concat @@ -2931,7 +2915,6 @@ #define gv_autoload4(a,b,c,d) Perl_gv_autoload4(aTHX_ a,b,c,d) #define gv_check(a) Perl_gv_check(aTHX_ a) #define gv_efullname(a,b) Perl_gv_efullname(aTHX_ a,b) -#define gv_efullname3(a,b,c) Perl_gv_efullname3(aTHX_ a,b,c) #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) @@ -2940,7 +2923,6 @@ #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) #define gv_fullname(a,b) Perl_gv_fullname(aTHX_ a,b) -#define gv_fullname3(a,b,c) Perl_gv_fullname3(aTHX_ a,b,c) #define gv_fullname4(a,b,c,d) Perl_gv_fullname4(aTHX_ a,b,c,d) #define gv_init(a,b,c,d,e) Perl_gv_init(aTHX_ a,b,c,d,e) #define gv_stashpv(a,b) Perl_gv_stashpv(aTHX_ a,b) @@ -3067,6 +3049,8 @@ #ifdef PERL_CORE #define op_clear(a) Perl_op_clear(aTHX_ a) #endif +#define op_refcnt_lock() Perl_op_refcnt_lock(aTHX) +#define op_refcnt_unlock() Perl_op_refcnt_unlock(aTHX) #ifdef PERL_CORE #define linklist(a) Perl_linklist(aTHX_ a) #endif @@ -3800,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) @@ -3838,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 @@ -4005,7 +3987,7 @@ #define forbid_setid(a) S_forbid_setid(aTHX_ a) #endif #ifdef PERL_CORE -#define incpush(a,b,c,d) S_incpush(aTHX_ a,b,c,d) +#define incpush(a,b,c,d,e) S_incpush(aTHX_ a,b,c,d,e) #endif #ifdef PERL_CORE #define init_interp() S_init_interp(aTHX) @@ -4060,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 @@ -4103,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 @@ -4119,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 @@ -4258,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) @@ -4271,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) @@ -4313,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) @@ -4728,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 @@ -4748,7 +4711,7 @@ #endif #if defined(DEBUGGING) #ifdef PERL_CORE -#define get_debug_opts(a) Perl_get_debug_opts(aTHX_ a) +#define get_debug_opts(a,b) Perl_get_debug_opts(aTHX_ a,b) #endif #endif #define save_set_svflags(a,b,c) Perl_save_set_svflags(aTHX_ a,b,c) @@ -4893,6 +4856,12 @@ #ifdef PERL_CORE #define my_swabn Perl_my_swabn #endif +#define gv_fetchpvn_flags(a,b,c,d) Perl_gv_fetchpvn_flags(aTHX_ a,b,c,d) +#define gv_fetchsv(a,b,c) Perl_gv_fetchsv(aTHX_ a,b,c) +#ifdef PERL_CORE +#define is_gv_magical_sv(a,b) Perl_is_gv_magical_sv(aTHX_ a,b) +#endif +#define savesvpv(a) Perl_savesvpv(aTHX_ a) #define ck_anoncode(a) Perl_ck_anoncode(aTHX_ a) #define ck_bitop(a) Perl_ck_bitop(aTHX_ a) #define ck_concat(a) Perl_ck_concat(aTHX_ a)