X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=d7a437ee4bcc2f21c0eeff1391b983c782421386;hb=19d266462241bb9c74189b116458c3843230112f;hp=81256a734f9f803396ab8ef02be4db6d8e79182e;hpb=82af08ae5f1a7d2e5deb69172b40d3168c149528;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embed.h b/embed.h index 81256a7..d7a437e 100644 --- a/embed.h +++ b/embed.h @@ -3,7 +3,7 @@ * embed.h * * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, by Larry Wall and others + * 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 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. @@ -56,9 +56,6 @@ #define av_delete Perl_av_delete #define av_exists Perl_av_exists #define av_extend Perl_av_extend -#ifdef PERL_CORE -#define av_fake Perl_av_fake -#endif #define av_fetch Perl_av_fetch #define av_fill Perl_av_fill #define av_len Perl_av_len @@ -159,7 +156,7 @@ #define deprecate_old Perl_deprecate_old #endif #define die Perl_die -#if defined(PERL_IN_UTIL_C) +#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define vdie S_vdie #endif @@ -198,7 +195,7 @@ #ifdef PERL_CORE #define do_execfree Perl_do_execfree #endif -#ifdef PERL_IN_DOIO_C +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define exec_failed S_exec_failed #endif @@ -252,7 +249,7 @@ #ifdef PERL_CORE #define find_script Perl_find_script #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define force_list S_force_list #define fold_constants S_fold_constants @@ -261,7 +258,7 @@ #define form Perl_form #define vform Perl_vform #define free_tmps Perl_free_tmps -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define gen_constant_list S_gen_constant_list #endif @@ -315,7 +312,7 @@ #define ibcmp Perl_ibcmp #define ibcmp_locale Perl_ibcmp_locale #define ibcmp_utf8 Perl_ibcmp_utf8 -#if defined(PERL_IN_DOIO_C) +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define ingroup S_ingroup #endif @@ -334,11 +331,6 @@ #define io_close Perl_io_close #define invert Perl_invert #endif -#if defined(PERL_IN_GV_C) -#ifdef PERL_CORE -#define is_gv_magical S_is_gv_magical -#endif -#endif #define is_lvalue_sub Perl_is_lvalue_sub #define to_uni_upper_lc Perl_to_uni_upper_lc #define to_uni_title_lc Perl_to_uni_title_lc @@ -411,7 +403,7 @@ #endif #define op_refcnt_lock Perl_op_refcnt_lock #define op_refcnt_unlock Perl_op_refcnt_unlock -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define linklist S_linklist #define listkids S_listkids @@ -623,9 +615,6 @@ #define nextargv Perl_nextargv #endif #define ninstr Perl_ninstr -#ifdef PERL_CORE -#define oopsCV Perl_oopsCV -#endif #define op_free Perl_op_free #ifdef PERL_MAD #ifdef PERL_CORE @@ -651,7 +640,7 @@ #ifdef PERL_CORE #define pad_free Perl_pad_free #endif -#if defined(PERL_IN_PAD_C) +#if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define pad_reset S_pad_reset #endif @@ -691,23 +680,29 @@ #define require_pv Perl_require_pv #define pack_cat Perl_pack_cat #define packlist Perl_packlist -#ifdef PERL_USES_PL_PIDSTATUS +#if defined(PERL_USES_PL_PIDSTATUS) && defined(PERL_IN_UTIL_C) #ifdef PERL_CORE -#define pidgone Perl_pidgone +#define pidgone S_pidgone #endif #endif #define pmflag Perl_pmflag #ifdef PERL_CORE #define pmruntime Perl_pmruntime -#define pmtrans Perl_pmtrans +#endif +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define pmtrans S_pmtrans +#endif #endif #define pop_scope Perl_pop_scope #ifdef PERL_CORE #define prepend_elem Perl_prepend_elem #endif #define push_scope Perl_push_scope +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE -#define refkids Perl_refkids +#define refkids S_refkids +#endif #endif #define regdump Perl_regdump #define regdump Perl_regdump @@ -757,9 +752,13 @@ #define rsignal_save Perl_rsignal_save #endif #define rsignal_state Perl_rsignal_state +#if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define rxres_free S_rxres_free +#define rxres_restore S_rxres_restore +#endif +#endif #ifdef PERL_CORE -#define rxres_free Perl_rxres_free -#define rxres_restore Perl_rxres_restore #define rxres_save Perl_rxres_save #endif #if !defined(HAS_RENAME) @@ -781,18 +780,17 @@ #define save_bool Perl_save_bool #define save_clearsv Perl_save_clearsv #define save_delete Perl_save_delete +#define save_adelete Perl_save_adelete #define save_destructor Perl_save_destructor #define save_destructor_x Perl_save_destructor_x -#define save_freesv Perl_save_freesv -#ifdef PERL_CORE -#define save_freeop Perl_save_freeop -#endif -#define save_freepv Perl_save_freepv #define save_generic_svref Perl_save_generic_svref #define save_generic_pvref Perl_save_generic_pvref #define save_shared_pvref Perl_save_shared_pvref #define save_gp Perl_save_gp #define save_hash Perl_save_hash +#ifdef PERL_CORE +#define save_hints Perl_save_hints +#endif #define save_helem_flags Perl_save_helem_flags #define save_hptr Perl_save_hptr #define save_I16 Perl_save_I16 @@ -803,11 +801,7 @@ #define save_iv Perl_save_iv #define save_list Perl_save_list #define save_long Perl_save_long -#define save_mortalizesv Perl_save_mortalizesv #define save_nogv Perl_save_nogv -#ifdef PERL_CORE -#define save_op Perl_save_op -#endif #define save_scalar Perl_save_scalar #define save_pptr Perl_save_pptr #define save_vptr Perl_save_vptr @@ -815,11 +809,21 @@ #define save_padsv_and_mortalize Perl_save_padsv_and_mortalize #define save_sptr Perl_save_sptr #define save_svref Perl_save_svref +#define save_pushptr Perl_save_pushptr +#ifdef PERL_CORE +#define save_pushi32ptr Perl_save_pushi32ptr +#define save_pushptrptr Perl_save_pushptrptr +#endif +#if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define save_pushptri32ptr S_save_pushptri32ptr +#endif +#endif #ifdef PERL_CORE #define sawparens Perl_sawparens #define scalar Perl_scalar #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define scalarkids S_scalarkids #define scalarseq S_scalarseq @@ -836,11 +840,6 @@ #define scope Perl_scope #endif #define screaminstr Perl_screaminstr -#if !defined(VMS) -#ifdef PERL_CORE -#define setenv_getix Perl_setenv_getix -#endif -#endif #define setdefout Perl_setdefout #define share_hek Perl_share_hek #if defined(HAS_SIGACTION) && defined(SA_SIGINFO) @@ -862,7 +861,7 @@ #define sv_2bool Perl_sv_2bool #define sv_2cv Perl_sv_2cv #define sv_2io Perl_sv_2io -#ifdef PERL_IN_SV_C +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define glob_2number S_glob_2number #define glob_2pv S_glob_2pv @@ -886,8 +885,10 @@ #define sv_pvutf8n Perl_sv_pvutf8n #define sv_pvbyten Perl_sv_pvbyten #define sv_true Perl_sv_true +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE -#define sv_add_arena Perl_sv_add_arena +#define sv_add_arena S_sv_add_arena +#endif #endif #define sv_backoff Perl_sv_backoff #define sv_bless Perl_sv_bless @@ -1046,7 +1047,11 @@ #ifdef PERL_CORE #define yyparse Perl_yyparse #define parser_free Perl_parser_free -#define yywarn Perl_yywarn +#endif +#if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define yywarn S_yywarn +#endif #endif #if defined(MYMALLOC) #define dump_mstats Perl_dump_mstats @@ -1644,7 +1649,7 @@ #define sv_setsv_flags Perl_sv_setsv_flags #define sv_catpvn_flags Perl_sv_catpvn_flags #define sv_catsv_flags Perl_sv_catsv_flags -#define sv_utf8_upgrade_flags Perl_sv_utf8_upgrade_flags +#define sv_utf8_upgrade_flags_grow Perl_sv_utf8_upgrade_flags_grow #define sv_pvn_force_flags Perl_sv_pvn_force_flags #define sv_copypv Perl_sv_copypv #define my_atof2 Perl_my_atof2 @@ -1682,7 +1687,7 @@ #ifdef PERL_CORE #define deb_stack_all Perl_deb_stack_all #endif -#ifdef PERL_IN_DEB_C +#if defined(PERL_IN_DEB_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define deb_stack_n S_deb_stack_n #endif @@ -1952,9 +1957,6 @@ #endif #if !defined(HAS_SIGNBIT) #endif -#ifdef PERL_CORE -#define mro_meta_init Perl_mro_meta_init -#endif #if defined(USE_ITHREADS) #ifdef PERL_CORE #define mro_meta_dup Perl_mro_meta_dup @@ -1963,7 +1965,6 @@ #define mro_get_linear_isa Perl_mro_get_linear_isa #if defined(PERL_IN_MRO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE -#define mro_get_linear_isa_c3 S_mro_get_linear_isa_c3 #define mro_get_linear_isa_dfs S_mro_get_linear_isa_dfs #endif #endif @@ -2408,9 +2409,6 @@ #define av_delete(a,b,c) Perl_av_delete(aTHX_ a,b,c) #define av_exists(a,b) Perl_av_exists(aTHX_ a,b) #define av_extend(a,b) Perl_av_extend(aTHX_ a,b) -#ifdef PERL_CORE -#define av_fake(a,b) Perl_av_fake(aTHX_ a,b) -#endif #define av_fetch(a,b,c) Perl_av_fetch(aTHX_ a,b,c) #define av_fill(a,b) Perl_av_fill(aTHX_ a,b) #define av_len(a) Perl_av_len(aTHX_ a) @@ -2493,7 +2491,7 @@ #define deprecate(a) Perl_deprecate(aTHX_ a) #define deprecate_old(a) Perl_deprecate_old(aTHX_ a) #endif -#if defined(PERL_IN_UTIL_C) +#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define vdie(a,b) S_vdie(aTHX_ a,b) #endif @@ -2534,7 +2532,7 @@ #ifdef PERL_CORE #define do_execfree() Perl_do_execfree(aTHX) #endif -#ifdef PERL_IN_DOIO_C +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define exec_failed(a,b,c) S_exec_failed(aTHX_ a,b,c) #endif @@ -2588,7 +2586,7 @@ #ifdef PERL_CORE #define find_script(a,b,c,d) Perl_find_script(aTHX_ a,b,c,d) #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define force_list(a) S_force_list(aTHX_ a) #define fold_constants(a) S_fold_constants(aTHX_ a) @@ -2596,7 +2594,7 @@ #endif #define vform(a,b) Perl_vform(aTHX_ a,b) #define free_tmps() Perl_free_tmps(aTHX) -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define gen_constant_list(a) S_gen_constant_list(aTHX_ a) #endif @@ -2662,7 +2660,7 @@ #define ibcmp(a,b,c) Perl_ibcmp(aTHX_ a,b,c) #define ibcmp_locale(a,b,c) Perl_ibcmp_locale(aTHX_ a,b,c) #define ibcmp_utf8(a,b,c,d,e,f,g,h) Perl_ibcmp_utf8(aTHX_ a,b,c,d,e,f,g,h) -#if defined(PERL_IN_DOIO_C) +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define ingroup(a,b) S_ingroup(aTHX_ a,b) #endif @@ -2681,11 +2679,6 @@ #define io_close(a,b) Perl_io_close(aTHX_ a,b) #define invert(a) Perl_invert(aTHX_ a) #endif -#if defined(PERL_IN_GV_C) -#ifdef PERL_CORE -#define is_gv_magical(a,b,c) S_is_gv_magical(aTHX_ a,b,c) -#endif -#endif #define is_lvalue_sub() Perl_is_lvalue_sub(aTHX) #define to_uni_upper_lc(a) Perl_to_uni_upper_lc(aTHX_ a) #define to_uni_title_lc(a) Perl_to_uni_title_lc(aTHX_ a) @@ -2758,7 +2751,7 @@ #endif #define op_refcnt_lock() Perl_op_refcnt_lock(aTHX) #define op_refcnt_unlock() Perl_op_refcnt_unlock(aTHX) -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define linklist(a) S_linklist(aTHX_ a) #define listkids(a) S_listkids(aTHX_ a) @@ -2967,9 +2960,6 @@ #define nextargv(a) Perl_nextargv(aTHX_ a) #endif #define ninstr(a,b,c,d) Perl_ninstr(aTHX_ a,b,c,d) -#ifdef PERL_CORE -#define oopsCV(a) Perl_oopsCV(aTHX_ a) -#endif #define op_free(a) Perl_op_free(aTHX_ a) #ifdef PERL_MAD #ifdef PERL_CORE @@ -2995,7 +2985,7 @@ #ifdef PERL_CORE #define pad_free(a) Perl_pad_free(aTHX_ a) #endif -#if defined(PERL_IN_PAD_C) +#if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define pad_reset() S_pad_reset(aTHX) #endif @@ -3034,23 +3024,29 @@ #define require_pv(a) Perl_require_pv(aTHX_ a) #define pack_cat(a,b,c,d,e,f,g) Perl_pack_cat(aTHX_ a,b,c,d,e,f,g) #define packlist(a,b,c,d,e) Perl_packlist(aTHX_ a,b,c,d,e) -#ifdef PERL_USES_PL_PIDSTATUS +#if defined(PERL_USES_PL_PIDSTATUS) && defined(PERL_IN_UTIL_C) #ifdef PERL_CORE -#define pidgone(a,b) Perl_pidgone(aTHX_ a,b) +#define pidgone(a,b) S_pidgone(aTHX_ a,b) #endif #endif #define pmflag(a,b) Perl_pmflag(aTHX_ a,b) #ifdef PERL_CORE #define pmruntime(a,b,c) Perl_pmruntime(aTHX_ a,b,c) -#define pmtrans(a,b,c) Perl_pmtrans(aTHX_ a,b,c) +#endif +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define pmtrans(a,b,c) S_pmtrans(aTHX_ a,b,c) +#endif #endif #define pop_scope() Perl_pop_scope(aTHX) #ifdef PERL_CORE #define prepend_elem(a,b,c) Perl_prepend_elem(aTHX_ a,b,c) #endif #define push_scope() Perl_push_scope(aTHX) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE -#define refkids(a,b) Perl_refkids(aTHX_ a,b) +#define refkids(a,b) S_refkids(aTHX_ a,b) +#endif #endif #define regdump(a) Perl_regdump(aTHX_ a) #define regdump(a) Perl_regdump(aTHX_ a) @@ -3100,9 +3096,13 @@ #define rsignal_save(a,b,c) Perl_rsignal_save(aTHX_ a,b,c) #endif #define rsignal_state(a) Perl_rsignal_state(aTHX_ a) +#if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define rxres_free(a) S_rxres_free(aTHX_ a) +#define rxres_restore(a,b) S_rxres_restore(aTHX_ a,b) +#endif +#endif #ifdef PERL_CORE -#define rxres_free(a) Perl_rxres_free(aTHX_ a) -#define rxres_restore(a,b) Perl_rxres_restore(aTHX_ a,b) #define rxres_save(a,b) Perl_rxres_save(aTHX_ a,b) #endif #if !defined(HAS_RENAME) @@ -3124,18 +3124,19 @@ #define save_bool(a) Perl_save_bool(aTHX_ a) #define save_clearsv(a) Perl_save_clearsv(aTHX_ a) #define save_delete(a,b,c) Perl_save_delete(aTHX_ a,b,c) +#define save_adelete(a,b) Perl_save_adelete(aTHX_ a,b) #define save_destructor(a,b) Perl_save_destructor(aTHX_ a,b) #define save_destructor_x(a,b) Perl_save_destructor_x(aTHX_ a,b) -#define save_freesv(a) Perl_save_freesv(aTHX_ a) #ifdef PERL_CORE -#define save_freeop(a) Perl_save_freeop(aTHX_ a) #endif -#define save_freepv(a) Perl_save_freepv(aTHX_ a) #define save_generic_svref(a) Perl_save_generic_svref(aTHX_ a) #define save_generic_pvref(a) Perl_save_generic_pvref(aTHX_ a) #define save_shared_pvref(a) Perl_save_shared_pvref(aTHX_ a) #define save_gp(a,b) Perl_save_gp(aTHX_ a,b) #define save_hash(a) Perl_save_hash(aTHX_ a) +#ifdef PERL_CORE +#define save_hints() Perl_save_hints(aTHX) +#endif #define save_helem_flags(a,b,c,d) Perl_save_helem_flags(aTHX_ a,b,c,d) #define save_hptr(a) Perl_save_hptr(aTHX_ a) #define save_I16(a) Perl_save_I16(aTHX_ a) @@ -3146,10 +3147,8 @@ #define save_iv(a) Perl_save_iv(aTHX_ a) #define save_list(a,b) Perl_save_list(aTHX_ a,b) #define save_long(a) Perl_save_long(aTHX_ a) -#define save_mortalizesv(a) Perl_save_mortalizesv(aTHX_ a) #define save_nogv(a) Perl_save_nogv(aTHX_ a) #ifdef PERL_CORE -#define save_op() Perl_save_op(aTHX) #endif #define save_scalar(a) Perl_save_scalar(aTHX_ a) #define save_pptr(a) Perl_save_pptr(aTHX_ a) @@ -3158,11 +3157,21 @@ #define save_padsv_and_mortalize(a) Perl_save_padsv_and_mortalize(aTHX_ a) #define save_sptr(a) Perl_save_sptr(aTHX_ a) #define save_svref(a) Perl_save_svref(aTHX_ a) +#define save_pushptr(a,b) Perl_save_pushptr(aTHX_ a,b) +#ifdef PERL_CORE +#define save_pushi32ptr(a,b,c) Perl_save_pushi32ptr(aTHX_ a,b,c) +#define save_pushptrptr(a,b,c) Perl_save_pushptrptr(aTHX_ a,b,c) +#endif +#if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define save_pushptri32ptr(a,b,c,d) S_save_pushptri32ptr(aTHX_ a,b,c,d) +#endif +#endif #ifdef PERL_CORE #define sawparens(a) Perl_sawparens(aTHX_ a) #define scalar(a) Perl_scalar(aTHX_ a) #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define scalarkids(a) S_scalarkids(aTHX_ a) #define scalarseq(a) S_scalarseq(aTHX_ a) @@ -3179,11 +3188,6 @@ #define scope(a) Perl_scope(aTHX_ a) #endif #define screaminstr(a,b,c,d,e,f) Perl_screaminstr(aTHX_ a,b,c,d,e,f) -#if !defined(VMS) -#ifdef PERL_CORE -#define setenv_getix(a) Perl_setenv_getix(aTHX_ a) -#endif -#endif #define setdefout(a) Perl_setdefout(aTHX_ a) #define share_hek(a,b,c) Perl_share_hek(aTHX_ a,b,c) #if defined(HAS_SIGACTION) && defined(SA_SIGINFO) @@ -3205,7 +3209,7 @@ #define sv_2bool(a) Perl_sv_2bool(aTHX_ a) #define sv_2cv(a,b,c,d) Perl_sv_2cv(aTHX_ a,b,c,d) #define sv_2io(a) Perl_sv_2io(aTHX_ a) -#ifdef PERL_IN_SV_C +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define glob_2number(a) S_glob_2number(aTHX_ a) #define glob_2pv(a,b) S_glob_2pv(aTHX_ a,b) @@ -3229,8 +3233,10 @@ #define sv_pvutf8n(a,b) Perl_sv_pvutf8n(aTHX_ a,b) #define sv_pvbyten(a,b) Perl_sv_pvbyten(aTHX_ a,b) #define sv_true(a) Perl_sv_true(aTHX_ a) +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE -#define sv_add_arena(a,b,c) Perl_sv_add_arena(aTHX_ a,b,c) +#define sv_add_arena(a,b,c) S_sv_add_arena(aTHX_ a,b,c) +#endif #endif #define sv_backoff(a) Perl_sv_backoff(aTHX_ a) #define sv_bless(a,b) Perl_sv_bless(aTHX_ a,b) @@ -3385,7 +3391,11 @@ #ifdef PERL_CORE #define yyparse() Perl_yyparse(aTHX) #define parser_free(a) Perl_parser_free(aTHX_ a) -#define yywarn(a) Perl_yywarn(aTHX_ a) +#endif +#if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define yywarn(a) S_yywarn(aTHX_ a) +#endif #endif #if defined(MYMALLOC) #define dump_mstats(a) Perl_dump_mstats(aTHX_ a) @@ -3626,7 +3636,7 @@ #ifdef PERL_CORE #define find_beginning(a,b) S_find_beginning(aTHX_ a,b) #define forbid_setid(a,b) S_forbid_setid(aTHX_ a,b) -#define incpush(a,b,c,d,e) S_incpush(aTHX_ a,b,c,d,e) +#define incpush(a,b,c,d,e,f) S_incpush(aTHX_ a,b,c,d,e,f) #define init_interp() S_init_interp(aTHX) #define init_ids() S_init_ids(aTHX) #define init_main_stash() S_init_main_stash(aTHX) @@ -3997,7 +4007,7 @@ #define sv_setsv_flags(a,b,c) Perl_sv_setsv_flags(aTHX_ a,b,c) #define sv_catpvn_flags(a,b,c,d) Perl_sv_catpvn_flags(aTHX_ a,b,c,d) #define sv_catsv_flags(a,b,c) Perl_sv_catsv_flags(aTHX_ a,b,c) -#define sv_utf8_upgrade_flags(a,b) Perl_sv_utf8_upgrade_flags(aTHX_ a,b) +#define sv_utf8_upgrade_flags_grow(a,b,c) Perl_sv_utf8_upgrade_flags_grow(aTHX_ a,b,c) #define sv_pvn_force_flags(a,b,c) Perl_sv_pvn_force_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) @@ -4035,7 +4045,7 @@ #ifdef PERL_CORE #define deb_stack_all() Perl_deb_stack_all(aTHX) #endif -#ifdef PERL_IN_DEB_C +#if defined(PERL_IN_DEB_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define deb_stack_n(a,b,c,d,e) S_deb_stack_n(aTHX_ a,b,c,d,e) #endif @@ -4312,7 +4322,6 @@ #if defined(PERL_CORE) || defined(PERL_EXT) #endif #ifdef PERL_CORE -#define mro_meta_init(a) Perl_mro_meta_init(aTHX_ a) #endif #if defined(USE_ITHREADS) #ifdef PERL_CORE @@ -4322,7 +4331,6 @@ #define mro_get_linear_isa(a) Perl_mro_get_linear_isa(aTHX_ a) #if defined(PERL_IN_MRO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE -#define mro_get_linear_isa_c3(a,b) S_mro_get_linear_isa_c3(aTHX_ a,b) #define mro_get_linear_isa_dfs(a,b) S_mro_get_linear_isa_dfs(aTHX_ a,b) #endif #endif