This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
updated ptags generator from Ilya Zakharevich
[perl5.git] / embed.h
diff --git a/embed.h b/embed.h
index ba07096..ac84905 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -7,6 +7,39 @@
 
 /* NO_EMBED is no longer supported. i.e. EMBED is always active. */
 
+/* provide binary compatible (but inconsistent) names */
+#if defined(PERL_BINCOMPAT_5005)
+#  define  Perl_call_argv              perl_call_argv
+#  define  Perl_call_method            perl_call_method
+#  define  Perl_call_pv                        perl_call_pv
+#  define  Perl_call_sv                        perl_call_sv
+#  define  Perl_get_av                 perl_get_av
+#  define  Perl_get_cv                 perl_get_cv
+#  define  Perl_get_hv                 perl_get_hv
+#  define  Perl_get_sv                 perl_get_sv
+#  define  Perl_init_i18nl10n          perl_init_i18nl10n
+#  define  Perl_init_i18nl14n          perl_init_i18nl14n
+#  define  Perl_new_collate            perl_new_collate
+#  define  Perl_new_ctype              perl_new_ctype
+#  define  Perl_new_numeric            perl_new_numeric
+#  define  Perl_require_pv             perl_require_pv
+#  define  Perl_safesyscalloc          Perl_safecalloc
+#  define  Perl_safesysfree            Perl_safefree
+#  define  Perl_safesysmalloc          Perl_safemalloc
+#  define  Perl_safesysrealloc         Perl_saferealloc
+#  define  Perl_set_numeric_local      perl_set_numeric_local
+#  define  Perl_set_numeric_standard   perl_set_numeric_standard
+/* malloc() pollution was the default in earlier versions, so enable
+ * it for bincompat; but not for systems that used to do prevent that,
+ * or when they ask for {HIDE,EMBED}MYMALLOC */
+#  if !defined(EMBEDMYMALLOC) && !defined(HIDEMYMALLOC)
+#    if !defined(NeXT) && !defined(__NeXT) && !defined(__MACHTEN__) && \
+        !defined(__QNX__)
+#      define  PERL_POLLUTE_MALLOC
+#    endif
+#  endif
+#endif
+
 /* Hide global symbols */
 
 #if !defined(PERL_OBJECT)
@@ -19,7 +52,6 @@
 #define append_elem            Perl_append_elem
 #define append_list            Perl_append_list
 #define apply                  Perl_apply
-#define assertref              Perl_assertref
 #define avhv_exists_ent                Perl_avhv_exists_ent
 #define avhv_fetch_ent         Perl_avhv_fetch_ent
 #define avhv_iternext          Perl_avhv_iternext
 #endif
 #define convert                        Perl_convert
 #define croak                  Perl_croak
+#define vcroak                 Perl_vcroak
 #if defined(PERL_IMPLICIT_CONTEXT)
 #define croak_nocontext                Perl_croak_nocontext
 #define die_nocontext          Perl_die_nocontext
+#define deb_nocontext          Perl_deb_nocontext
 #define form_nocontext         Perl_form_nocontext
+#define mess_nocontext         Perl_mess_nocontext
 #define warn_nocontext         Perl_warn_nocontext
+#define warner_nocontext       Perl_warner_nocontext
 #define newSVpvf_nocontext     Perl_newSVpvf_nocontext
 #define sv_catpvf_nocontext    Perl_sv_catpvf_nocontext
 #define sv_setpvf_nocontext    Perl_sv_setpvf_nocontext
 #define sv_catpvf_mg_nocontext Perl_sv_catpvf_mg_nocontext
 #define sv_setpvf_mg_nocontext Perl_sv_setpvf_mg_nocontext
+#define fprintf_nocontext      Perl_fprintf_nocontext
 #endif
 #define cv_ckproto             Perl_cv_ckproto
 #define cv_clone               Perl_cv_clone
 #define get_ppaddr             Perl_get_ppaddr
 #define cxinc                  Perl_cxinc
 #define deb                    Perl_deb
+#define vdeb                   Perl_vdeb
 #define deb_growlevel          Perl_deb_growlevel
 #define debprofdump            Perl_debprofdump
 #define debop                  Perl_debop
 #define delimcpy               Perl_delimcpy
 #define deprecate              Perl_deprecate
 #define die                    Perl_die
+#define vdie                   Perl_vdie
 #define die_where              Perl_die_where
 #define dounwind               Perl_dounwind
 #define do_aexec               Perl_do_aexec
+#define do_aexec5              Perl_do_aexec5
 #define do_binmode             Perl_do_binmode
 #define do_chop                        Perl_do_chop
 #define do_close               Perl_do_close
 #define do_join                        Perl_do_join
 #define do_kv                  Perl_do_kv
 #define do_open                        Perl_do_open
+#define do_open9               Perl_do_open9
 #define do_pipe                        Perl_do_pipe
 #define do_print               Perl_do_print
 #define do_readline            Perl_do_readline
 #define do_sysseek             Perl_do_sysseek
 #define do_tell                        Perl_do_tell
 #define do_trans               Perl_do_trans
+#define do_vecget              Perl_do_vecget
 #define do_vecset              Perl_do_vecset
 #define do_vop                 Perl_do_vop
 #define dofile                 Perl_dofile
 #define force_list             Perl_force_list
 #define fold_constants         Perl_fold_constants
 #define form                   Perl_form
+#define vform                  Perl_vform
 #define free_tmps              Perl_free_tmps
 #define gen_constant_list      Perl_gen_constant_list
 #if !defined(HAS_GETENV_LEN)
 #define ibcmp                  Perl_ibcmp
 #define ibcmp_locale           Perl_ibcmp_locale
 #define ingroup                        Perl_ingroup
+#define init_debugger          Perl_init_debugger
 #define init_stacks            Perl_init_stacks
 #define intro_my               Perl_intro_my
 #define instr                  Perl_instr
 #define mem_collxfrm           Perl_mem_collxfrm
 #endif
 #define mess                   Perl_mess
+#define vmess                  Perl_vmess
+#define qerror                 Perl_qerror
 #define mg_clear               Perl_mg_clear
 #define mg_copy                        Perl_mg_copy
 #define mg_find                        Perl_mg_find
 #define newSVpv                        Perl_newSVpv
 #define newSVpvn               Perl_newSVpvn
 #define newSVpvf               Perl_newSVpvf
+#define vnewSVpvf              Perl_vnewSVpvf
 #define newSVrv                        Perl_newSVrv
 #define newSVsv                        Perl_newSVsv
 #define newUNOP                        Perl_newUNOP
 #define newWHILEOP             Perl_newWHILEOP
-#if defined(USE_THREADS)
-#define new_struct_thread      Perl_new_struct_thread
-#endif
 #define new_stackinfo          Perl_new_stackinfo
 #define nextargv               Perl_nextargv
 #define ninstr                 Perl_ninstr
 #define peep                   Perl_peep
 #if defined(PERL_OBJECT)
 #else
+#if defined(USE_THREADS)
+#define new_struct_thread      Perl_new_struct_thread
+#endif
 #endif
 #define call_atexit            Perl_call_atexit
 #define call_argv              Perl_call_argv
 #define sv_backoff             Perl_sv_backoff
 #define sv_bless               Perl_sv_bless
 #define sv_catpvf              Perl_sv_catpvf
+#define sv_vcatpvf             Perl_sv_vcatpvf
 #define sv_catpv               Perl_sv_catpv
 #define sv_catpvn              Perl_sv_catpvn
 #define sv_catsv               Perl_sv_catsv
 #define sv_report_used         Perl_sv_report_used
 #define sv_reset               Perl_sv_reset
 #define sv_setpvf              Perl_sv_setpvf
+#define sv_vsetpvf             Perl_sv_vsetpvf
 #define sv_setiv               Perl_sv_setiv
 #define sv_setpviv             Perl_sv_setpviv
 #define sv_setuv               Perl_sv_setuv
 #define vivify_ref             Perl_vivify_ref
 #define wait4pid               Perl_wait4pid
 #define warn                   Perl_warn
+#define vwarn                  Perl_vwarn
 #define warner                 Perl_warner
+#define vwarner                        Perl_vwarner
 #define watch                  Perl_watch
 #define whichsig               Perl_whichsig
 #define yyerror                        Perl_yyerror
 #if defined(PERL_GLOBAL_STRUCT)
 #define GetVars                        Perl_GetVars
 #endif
-#define yydestruct             Perl_yydestruct
 #define runops_standard                Perl_runops_standard
 #define runops_debug           Perl_runops_debug
-#if defined(WIN32)
-#if defined(PERL_OBJECT)
-#define ErrorNo                        Perl_ErrorNo
-#else
-#define ErrorNo                        Perl_ErrorNo
-#endif
-#endif
 #define sv_catpvf_mg           Perl_sv_catpvf_mg
+#define sv_vcatpvf_mg          Perl_sv_vcatpvf_mg
 #define sv_catpv_mg            Perl_sv_catpv_mg
 #define sv_catpvn_mg           Perl_sv_catpvn_mg
 #define sv_catsv_mg            Perl_sv_catsv_mg
 #define sv_setpvf_mg           Perl_sv_setpvf_mg
+#define sv_vsetpvf_mg          Perl_sv_vsetpvf_mg
 #define sv_setiv_mg            Perl_sv_setiv_mg
 #define sv_setpviv_mg          Perl_sv_setpviv_mg
 #define sv_setuv_mg            Perl_sv_setuv_mg
 #define get_vtbl               Perl_get_vtbl
 #define pv_display             Perl_pv_display
 #define dump_indent            Perl_dump_indent
+#define dump_vindent           Perl_dump_vindent
 #define do_gv_dump             Perl_do_gv_dump
 #define do_gvgv_dump           Perl_do_gvgv_dump
 #define do_hv_dump             Perl_do_hv_dump
 #define do_sv_dump             Perl_do_sv_dump
 #define magic_dump             Perl_magic_dump
 #define default_protect                Perl_default_protect
+#define vdefault_protect       Perl_vdefault_protect
 #define reginitcolors          Perl_reginitcolors
 #define sv_2pv_nolen           Perl_sv_2pv_nolen
 #define sv_pv                  Perl_sv_pv
 #define tmps_grow              Perl_tmps_grow
 #define sv_rvweaken            Perl_sv_rvweaken
 #define magic_killbackrefs     Perl_magic_killbackrefs
+#define newANONATTRSUB         Perl_newANONATTRSUB
+#define newATTRSUB             Perl_newATTRSUB
+#define newMYSUB               Perl_newMYSUB
+#define my_attrs               Perl_my_attrs
+#define boot_core_xsutils      Perl_boot_core_xsutils
 #if defined(PERL_OBJECT)
 #endif
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 #define save_magic             S_save_magic
 #define magic_methpack         S_magic_methpack
 #define magic_methcall         S_magic_methcall
-#define unwind_handler_stack   S_unwind_handler_stack
-#define restore_magic          S_restore_magic
 #endif
 #if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT)
 #define list_assignment                S_list_assignment
 #define bad_type               S_bad_type
+#define cop_free               S_cop_free
 #define modkids                        S_modkids
 #define no_bareword_allowed    S_no_bareword_allowed
 #define no_fh_allowed          S_no_fh_allowed
 #define scalarboolean          S_scalarboolean
 #define too_few_arguments      S_too_few_arguments
 #define too_many_arguments     S_too_many_arguments
+#define op_clear               S_op_clear
 #define null                   S_null
 #define pad_findlex            S_pad_findlex
 #define newDEFSVOP             S_newDEFSVOP
 #define gv_ename               S_gv_ename
 #define cv_clone2              S_cv_clone2
 #define scalar_mod_type                S_scalar_mod_type
+#define my_kid                 S_my_kid
+#define dup_attrlist           S_dup_attrlist
+#define apply_attrs            S_apply_attrs
 #  if defined(PL_OP_SLAB_ALLOC)
 #define Slab_Alloc             S_Slab_Alloc
 #  endif
 #define incpush                        S_incpush
 #define init_interp            S_init_interp
 #define init_ids               S_init_ids
-#define init_debugger          S_init_debugger
 #define init_lexer             S_init_lexer
 #define init_main_stash                S_init_main_stash
 #define init_perllib           S_init_perllib
 #define doeval                 S_doeval
 #define doopen_pmc             S_doopen_pmc
 #define qsortsv                        S_qsortsv
-#define sortcv                 S_sortcv
-#define sv_ncmp                        S_sv_ncmp
-#define sv_i_ncmp              S_sv_i_ncmp
-#define amagic_ncmp            S_amagic_ncmp
-#define amagic_i_ncmp          S_amagic_i_ncmp
-#define amagic_cmp             S_amagic_cmp
-#define amagic_cmp_locale      S_amagic_cmp_locale
 #endif
 #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT)
 #define get_db_sub             S_get_db_sub
-#  if defined(USE_THREADS)
-#define unset_cvowner          S_unset_cvowner
-#  endif
+#define method_common          S_method_common
 #endif
 #if defined(PERL_IN_PP_SYS_C) || defined(PERL_DECL_PROT)
 #define doform                 S_doform
 #define reganode               S_reganode
 #define regatom                        S_regatom
 #define regbranch              S_regbranch
-#define regc                   S_regc
 #define reguni                 S_reguni
 #define regclass               S_regclass
 #define regclassutf8           S_regclassutf8
 #define re_croak2              S_re_croak2
 #define regpposixcc            S_regpposixcc
 #define checkposixcc           S_checkposixcc
-#define clear_re               S_clear_re
 #endif
 #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT)
 #define regmatch               S_regmatch
 #define regcppop               S_regcppop
 #define regcp_set_to           S_regcp_set_to
 #define cache_re               S_cache_re
-#define restore_pos            S_restore_pos
 #define reghop                 S_reghop
 #define reghopmaybe            S_reghopmaybe
 #endif
 #define more_xiv               S_more_xiv
 #define more_xnv               S_more_xnv
 #define more_xpv               S_more_xpv
+#define more_xpviv             S_more_xpviv
+#define more_xpvnv             S_more_xpvnv
+#define more_xpvcv             S_more_xpvcv
+#define more_xpvav             S_more_xpvav
+#define more_xpvhv             S_more_xpvhv
+#define more_xpvmg             S_more_xpvmg
+#define more_xpvlv             S_more_xpvlv
+#define more_xpvbm             S_more_xpvbm
 #define more_xrv               S_more_xrv
 #define new_xiv                        S_new_xiv
 #define new_xnv                        S_new_xnv
 #define new_xpv                        S_new_xpv
+#define new_xpviv              S_new_xpviv
+#define new_xpvnv              S_new_xpvnv
+#define new_xpvcv              S_new_xpvcv
+#define new_xpvav              S_new_xpvav
+#define new_xpvhv              S_new_xpvhv
+#define new_xpvmg              S_new_xpvmg
+#define new_xpvlv              S_new_xpvlv
+#define new_xpvbm              S_new_xpvbm
 #define new_xrv                        S_new_xrv
 #define del_xiv                        S_del_xiv
 #define del_xnv                        S_del_xnv
 #define del_xpv                        S_del_xpv
+#define del_xpviv              S_del_xpviv
+#define del_xpvnv              S_del_xpvnv
+#define del_xpvcv              S_del_xpvcv
+#define del_xpvav              S_del_xpvav
+#define del_xpvhv              S_del_xpvhv
+#define del_xpvmg              S_del_xpvmg
+#define del_xpvlv              S_del_xpvlv
+#define del_xpvbm              S_del_xpvbm
 #define del_xrv                        S_del_xrv
 #define sv_unglob              S_sv_unglob
-#define do_report_used         S_do_report_used
-#define do_clean_objs          S_do_clean_objs
-#define do_clean_named_objs    S_do_clean_named_objs
-#define do_clean_all           S_do_clean_all
 #define not_a_number           S_not_a_number
 #define visit                  S_visit
 #  if defined(PURIFY)
 #define incl_perldb            S_incl_perldb
 #define utf16_textfilter       S_utf16_textfilter
 #define utf16rev_textfilter    S_utf16rev_textfilter
-#define restore_rsfp           S_restore_rsfp
-#define restore_expect         S_restore_expect
-#define restore_lex_expect     S_restore_lex_expect
 #  if defined(CRIPPLED_CC)
 #define uni                    S_uni
 #  endif
 #endif
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
 #define mess_alloc             S_mess_alloc
-#define do_croak               S_do_croak
-#define do_warn                        S_do_warn
-#define do_die                 S_do_die
 #  if defined(LEAKTEST)
 #define xstat                  S_xstat
 #  endif
 #define ck_glob                        Perl_ck_glob
 #define ck_grep                        Perl_ck_grep
 #define ck_index               Perl_ck_index
+#define ck_join                        Perl_ck_join
 #define ck_lengthconst         Perl_ck_lengthconst
 #define ck_lfun                        Perl_ck_lfun
 #define ck_listiob             Perl_ck_listiob
 #define ck_match               Perl_ck_match
+#define ck_method              Perl_ck_method
 #define ck_null                        Perl_ck_null
 #define ck_repeat              Perl_ck_repeat
 #define ck_require             Perl_ck_require
 #define pp_leaveeval           Perl_pp_leaveeval
 #define pp_leaveloop           Perl_pp_leaveloop
 #define pp_leavesub            Perl_pp_leavesub
+#define pp_leavesublv          Perl_pp_leavesublv
 #define pp_leavetry            Perl_pp_leavetry
 #define pp_leavewrite          Perl_pp_leavewrite
 #define pp_left_shift          Perl_pp_left_shift
 #define pp_mapwhile            Perl_pp_mapwhile
 #define pp_match               Perl_pp_match
 #define pp_method              Perl_pp_method
+#define pp_method_named                Perl_pp_method_named
 #define pp_mkdir               Perl_pp_mkdir
 #define pp_modulo              Perl_pp_modulo
 #define pp_msgctl              Perl_pp_msgctl
 #define pp_seq                 Perl_pp_seq
 #define pp_setpgrp             Perl_pp_setpgrp
 #define pp_setpriority         Perl_pp_setpriority
+#define pp_setstate            Perl_pp_setstate
 #define pp_sge                 Perl_pp_sge
 #define pp_sgrent              Perl_pp_sgrent
 #define pp_sgt                 Perl_pp_sgt
 #define append_elem(a,b,c)     Perl_append_elem(aTHX_ a,b,c)
 #define append_list(a,b,c)     Perl_append_list(aTHX_ a,b,c)
 #define apply(a,b,c)           Perl_apply(aTHX_ a,b,c)
-#define assertref(a)           Perl_assertref(aTHX_ a)
 #define avhv_exists_ent(a,b,c) Perl_avhv_exists_ent(aTHX_ a,b,c)
 #define avhv_fetch_ent(a,b,c,d)        Perl_avhv_fetch_ent(aTHX_ a,b,c,d)
 #define avhv_iternext(a)       Perl_avhv_iternext(aTHX_ a)
 #define condpair_magic(a)      Perl_condpair_magic(aTHX_ a)
 #endif
 #define convert(a,b,c)         Perl_convert(aTHX_ a,b,c)
+#define vcroak(a,b)            Perl_vcroak(aTHX_ a,b)
 #if defined(PERL_IMPLICIT_CONTEXT)
 #endif
 #define cv_ckproto(a,b,c)      Perl_cv_ckproto(aTHX_ a,b,c)
 #define get_opargs()           Perl_get_opargs(aTHX)
 #define get_ppaddr()           Perl_get_ppaddr(aTHX)
 #define cxinc()                        Perl_cxinc(aTHX)
+#define vdeb(a,b)              Perl_vdeb(aTHX_ a,b)
 #define deb_growlevel()                Perl_deb_growlevel(aTHX)
 #define debprofdump()          Perl_debprofdump(aTHX)
 #define debop(a)               Perl_debop(aTHX_ a)
 #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 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)
 #define do_aexec(a,b,c)                Perl_do_aexec(aTHX_ a,b,c)
+#define do_aexec5(a,b,c,d,e)   Perl_do_aexec5(aTHX_ a,b,c,d,e)
 #define do_binmode(a,b,c)      Perl_do_binmode(aTHX_ a,b,c)
 #define do_chop(a,b)           Perl_do_chop(aTHX_ a,b)
 #define do_close(a,b)          Perl_do_close(aTHX_ a,b)
 #define do_join(a,b,c,d)       Perl_do_join(aTHX_ a,b,c,d)
 #define do_kv()                        Perl_do_kv(aTHX)
 #define do_open(a,b,c,d,e,f,g) Perl_do_open(aTHX_ a,b,c,d,e,f,g)
+#define do_open9(a,b,c,d,e,f,g,h,i)    Perl_do_open9(aTHX_ a,b,c,d,e,f,g,h,i)
 #define do_pipe(a,b,c)         Perl_do_pipe(aTHX_ a,b,c)
 #define do_print(a,b)          Perl_do_print(aTHX_ a,b)
 #define do_readline()          Perl_do_readline(aTHX)
 #define do_sysseek(a,b,c)      Perl_do_sysseek(aTHX_ a,b,c)
 #define do_tell(a)             Perl_do_tell(aTHX_ a)
 #define do_trans(a)            Perl_do_trans(aTHX_ a)
+#define do_vecget(a,b,c)       Perl_do_vecget(aTHX_ a,b,c)
 #define do_vecset(a)           Perl_do_vecset(aTHX_ a)
 #define do_vop(a,b,c,d)                Perl_do_vop(aTHX_ a,b,c,d)
 #define dofile(a)              Perl_dofile(aTHX_ a)
 #endif
 #define force_list(a)          Perl_force_list(aTHX_ a)
 #define fold_constants(a)      Perl_fold_constants(aTHX_ a)
+#define vform(a,b)             Perl_vform(aTHX_ a,b)
 #define free_tmps()            Perl_free_tmps(aTHX)
 #define gen_constant_list(a)   Perl_gen_constant_list(aTHX_ a)
 #if !defined(HAS_GETENV_LEN)
 #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 ingroup(a,b)           Perl_ingroup(aTHX_ a,b)
+#define init_debugger()                Perl_init_debugger(aTHX)
 #define init_stacks()          Perl_init_stacks(aTHX)
 #define intro_my()             Perl_intro_my(aTHX)
 #define instr(a,b)             Perl_instr(aTHX_ a,b)
-#define io_close(a)            Perl_io_close(aTHX_ a)
+#define io_close(a,b)          Perl_io_close(aTHX_ a,b)
 #define invert(a)              Perl_invert(aTHX_ a)
 #define is_uni_alnum(a)                Perl_is_uni_alnum(aTHX_ a)
 #define is_uni_alnumc(a)       Perl_is_uni_alnumc(aTHX_ a)
 #if defined(USE_LOCALE_COLLATE)
 #define mem_collxfrm(a,b,c)    Perl_mem_collxfrm(aTHX_ a,b,c)
 #endif
-#define mess(a,b)              Perl_mess(aTHX_ a,b)
+#define vmess(a,b)             Perl_vmess(aTHX_ a,b)
+#define qerror(a)              Perl_qerror(aTHX_ a)
 #define mg_clear(a)            Perl_mg_clear(aTHX_ a)
 #define mg_copy(a,b,c,d)       Perl_mg_copy(aTHX_ a,b,c,d)
 #define mg_find(a,b)           Perl_mg_find(aTHX_ a,b)
 #define newSVnv(a)             Perl_newSVnv(aTHX_ a)
 #define newSVpv(a,b)           Perl_newSVpv(aTHX_ a,b)
 #define newSVpvn(a,b)          Perl_newSVpvn(aTHX_ a,b)
+#define vnewSVpvf(a,b)         Perl_vnewSVpvf(aTHX_ a,b)
 #define newSVrv(a,b)           Perl_newSVrv(aTHX_ a,b)
 #define newSVsv(a)             Perl_newSVsv(aTHX_ a)
 #define newUNOP(a,b,c)         Perl_newUNOP(aTHX_ a,b,c)
 #define newWHILEOP(a,b,c,d,e,f,g)      Perl_newWHILEOP(aTHX_ a,b,c,d,e,f,g)
-#if defined(USE_THREADS)
-#define new_struct_thread(a)   Perl_new_struct_thread(aTHX_ a)
-#endif
 #define new_stackinfo(a,b)     Perl_new_stackinfo(aTHX_ a,b)
 #define nextargv(a)            Perl_nextargv(aTHX_ a)
 #define ninstr(a,b,c,d)                Perl_ninstr(aTHX_ a,b,c,d)
 #define peep(a)                        Perl_peep(aTHX_ a)
 #if defined(PERL_OBJECT)
 #else
+#if defined(USE_THREADS)
+#define new_struct_thread(a)   Perl_new_struct_thread(aTHX_ a)
+#endif
 #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 sv_add_arena(a,b,c)    Perl_sv_add_arena(aTHX_ a,b,c)
 #define sv_backoff(a)          Perl_sv_backoff(aTHX_ a)
 #define sv_bless(a,b)          Perl_sv_bless(aTHX_ a,b)
+#define sv_vcatpvf(a,b,c)      Perl_sv_vcatpvf(aTHX_ a,b,c)
 #define sv_catpv(a,b)          Perl_sv_catpv(aTHX_ a,b)
 #define sv_catpvn(a,b,c)       Perl_sv_catpvn(aTHX_ a,b,c)
 #define sv_catsv(a,b)          Perl_sv_catsv(aTHX_ a,b)
 #define sv_replace(a,b)                Perl_sv_replace(aTHX_ a,b)
 #define sv_report_used()       Perl_sv_report_used(aTHX)
 #define sv_reset(a,b)          Perl_sv_reset(aTHX_ a,b)
+#define sv_vsetpvf(a,b,c)      Perl_sv_vsetpvf(aTHX_ a,b,c)
 #define sv_setiv(a,b)          Perl_sv_setiv(aTHX_ a,b)
 #define sv_setpviv(a,b)                Perl_sv_setpviv(aTHX_ a,b)
 #define sv_setuv(a,b)          Perl_sv_setuv(aTHX_ a,b)
 #define vivify_defelem(a)      Perl_vivify_defelem(aTHX_ a)
 #define vivify_ref(a,b)                Perl_vivify_ref(aTHX_ a,b)
 #define wait4pid(a,b,c)                Perl_wait4pid(aTHX_ a,b,c)
+#define vwarn(a,b)             Perl_vwarn(aTHX_ a,b)
+#define vwarner(a,b,c)         Perl_vwarner(aTHX_ a,b,c)
 #define watch(a)               Perl_watch(aTHX_ a)
 #define whichsig(a)            Perl_whichsig(aTHX_ a)
 #define yyerror(a)             Perl_yyerror(aTHX_ a)
 #if defined(PERL_GLOBAL_STRUCT)
 #define GetVars()              Perl_GetVars(aTHX)
 #endif
-#define yydestruct(a)          Perl_yydestruct(aTHX_ a)
 #define runops_standard()      Perl_runops_standard(aTHX)
 #define runops_debug()         Perl_runops_debug(aTHX)
-#if defined(WIN32)
-#if defined(PERL_OBJECT)
-#define ErrorNo()              Perl_ErrorNo(aTHX)
-#else
-#define ErrorNo()              Perl_ErrorNo(aTHX)
-#endif
-#endif
+#define sv_vcatpvf_mg(a,b,c)   Perl_sv_vcatpvf_mg(aTHX_ a,b,c)
 #define sv_catpv_mg(a,b)       Perl_sv_catpv_mg(aTHX_ a,b)
 #define sv_catpvn_mg(a,b,c)    Perl_sv_catpvn_mg(aTHX_ a,b,c)
 #define sv_catsv_mg(a,b)       Perl_sv_catsv_mg(aTHX_ a,b)
+#define sv_vsetpvf_mg(a,b,c)   Perl_sv_vsetpvf_mg(aTHX_ a,b,c)
 #define sv_setiv_mg(a,b)       Perl_sv_setiv_mg(aTHX_ a,b)
 #define sv_setpviv_mg(a,b)     Perl_sv_setpviv_mg(aTHX_ a,b)
 #define sv_setuv_mg(a,b)       Perl_sv_setuv_mg(aTHX_ a,b)
 #define sv_usepvn_mg(a,b,c)    Perl_sv_usepvn_mg(aTHX_ a,b,c)
 #define get_vtbl(a)            Perl_get_vtbl(aTHX_ a)
 #define pv_display(a,b,c,d,e)  Perl_pv_display(aTHX_ a,b,c,d,e)
+#define dump_vindent(a,b,c,d)  Perl_dump_vindent(aTHX_ a,b,c,d)
 #define do_gv_dump(a,b,c,d)    Perl_do_gv_dump(aTHX_ a,b,c,d)
 #define do_gvgv_dump(a,b,c,d)  Perl_do_gvgv_dump(aTHX_ a,b,c,d)
 #define do_hv_dump(a,b,c,d)    Perl_do_hv_dump(aTHX_ a,b,c,d)
 #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)
+#define vdefault_protect(a,b,c)        Perl_vdefault_protect(aTHX_ a,b,c)
 #define reginitcolors()                Perl_reginitcolors(aTHX)
 #define sv_2pv_nolen(a)                Perl_sv_2pv_nolen(aTHX_ a)
 #define sv_pv(a)               Perl_sv_pv(aTHX_ a)
 #define tmps_grow(a)           Perl_tmps_grow(aTHX_ a)
 #define sv_rvweaken(a)         Perl_sv_rvweaken(aTHX_ a)
 #define magic_killbackrefs(a,b)        Perl_magic_killbackrefs(aTHX_ a,b)
+#define newANONATTRSUB(a,b,c,d)        Perl_newANONATTRSUB(aTHX_ a,b,c,d)
+#define newATTRSUB(a,b,c,d,e)  Perl_newATTRSUB(aTHX_ a,b,c,d,e)
+#define newMYSUB(a,b,c,d,e)    Perl_newMYSUB(aTHX_ a,b,c,d,e)
+#define my_attrs(a,b)          Perl_my_attrs(aTHX_ a,b)
+#define boot_core_xsutils()    Perl_boot_core_xsutils(aTHX)
 #if defined(PERL_OBJECT)
 #endif
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 #define save_magic(a,b)                S_save_magic(aTHX_ a,b)
 #define magic_methpack(a,b,c)  S_magic_methpack(aTHX_ a,b,c)
 #define magic_methcall(a,b,c,d,e,f)    S_magic_methcall(aTHX_ a,b,c,d,e,f)
-#define unwind_handler_stack(a)        S_unwind_handler_stack(aTHX_ a)
-#define restore_magic(a)       S_restore_magic(aTHX_ a)
 #endif
 #if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT)
 #define list_assignment(a)     S_list_assignment(aTHX_ a)
 #define bad_type(a,b,c,d)      S_bad_type(aTHX_ a,b,c,d)
+#define cop_free(a)            S_cop_free(aTHX_ a)
 #define modkids(a,b)           S_modkids(aTHX_ a,b)
 #define no_bareword_allowed(a) S_no_bareword_allowed(aTHX_ a)
 #define no_fh_allowed(a)       S_no_fh_allowed(aTHX_ a)
 #define scalarboolean(a)       S_scalarboolean(aTHX_ a)
 #define too_few_arguments(a,b) S_too_few_arguments(aTHX_ a,b)
 #define too_many_arguments(a,b)        S_too_many_arguments(aTHX_ a,b)
+#define op_clear(a)            S_op_clear(aTHX_ a)
 #define null(a)                        S_null(aTHX_ a)
 #define pad_findlex(a,b,c,d,e,f,g)     S_pad_findlex(aTHX_ a,b,c,d,e,f,g)
 #define newDEFSVOP()           S_newDEFSVOP(aTHX)
 #define gv_ename(a)            S_gv_ename(aTHX_ a)
 #define cv_clone2(a,b)         S_cv_clone2(aTHX_ a,b)
 #define scalar_mod_type(a,b)   S_scalar_mod_type(aTHX_ a,b)
+#define my_kid(a,b)            S_my_kid(aTHX_ a,b)
+#define dup_attrlist(a)                S_dup_attrlist(aTHX_ a)
+#define apply_attrs(a,b,c)     S_apply_attrs(aTHX_ a,b,c)
 #  if defined(PL_OP_SLAB_ALLOC)
 #define Slab_Alloc(a,b)                S_Slab_Alloc(aTHX_ a,b)
 #  endif
 #define incpush(a,b)           S_incpush(aTHX_ a,b)
 #define init_interp()          S_init_interp(aTHX)
 #define init_ids()             S_init_ids(aTHX)
-#define init_debugger()                S_init_debugger(aTHX)
 #define init_lexer()           S_init_lexer(aTHX)
 #define init_main_stash()      S_init_main_stash(aTHX)
 #define init_perllib()         S_init_perllib(aTHX)
 #define doeval(a,b)            S_doeval(aTHX_ a,b)
 #define doopen_pmc(a,b)                S_doopen_pmc(aTHX_ a,b)
 #define qsortsv(a,b,c)         S_qsortsv(aTHX_ a,b,c)
-#define sortcv(a,b)            S_sortcv(aTHX_ a,b)
-#define sv_ncmp(a,b)           S_sv_ncmp(aTHX_ a,b)
-#define sv_i_ncmp(a,b)         S_sv_i_ncmp(aTHX_ a,b)
-#define amagic_ncmp(a,b)       S_amagic_ncmp(aTHX_ a,b)
-#define amagic_i_ncmp(a,b)     S_amagic_i_ncmp(aTHX_ a,b)
-#define amagic_cmp(a,b)                S_amagic_cmp(aTHX_ a,b)
-#define amagic_cmp_locale(a,b) S_amagic_cmp_locale(aTHX_ a,b)
 #endif
 #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT)
 #define get_db_sub(a,b)                S_get_db_sub(aTHX_ a,b)
-#  if defined(USE_THREADS)
-#define unset_cvowner(a)       S_unset_cvowner(aTHX_ a)
-#  endif
+#define method_common(a,b)     S_method_common(aTHX_ a,b)
 #endif
 #if defined(PERL_IN_PP_SYS_C) || defined(PERL_DECL_PROT)
 #define doform(a,b,c)          S_doform(aTHX_ a,b,c)
 #define reganode(a,b)          S_reganode(aTHX_ a,b)
 #define regatom(a)             S_regatom(aTHX_ a)
 #define regbranch(a,b)         S_regbranch(aTHX_ a,b)
-#define regc(a,b)              S_regc(aTHX_ a,b)
 #define reguni(a,b,c)          S_reguni(aTHX_ a,b,c)
 #define regclass()             S_regclass(aTHX)
 #define regclassutf8()         S_regclassutf8(aTHX)
 #define add_data(a,b)          S_add_data(aTHX_ a,b)
 #define regpposixcc(a)         S_regpposixcc(aTHX_ a)
 #define checkposixcc()         S_checkposixcc(aTHX)
-#define clear_re(a)            S_clear_re(aTHX_ a)
 #endif
 #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT)
 #define regmatch(a)            S_regmatch(aTHX_ a)
 #define regcppop()             S_regcppop(aTHX)
 #define regcp_set_to(a)                S_regcp_set_to(aTHX_ a)
 #define cache_re(a)            S_cache_re(aTHX_ a)
-#define restore_pos(a)         S_restore_pos(aTHX_ a)
 #define reghop(a,b)            S_reghop(aTHX_ a,b)
 #define reghopmaybe(a,b)       S_reghopmaybe(aTHX_ a,b)
 #endif
 #define more_xiv()             S_more_xiv(aTHX)
 #define more_xnv()             S_more_xnv(aTHX)
 #define more_xpv()             S_more_xpv(aTHX)
+#define more_xpviv()           S_more_xpviv(aTHX)
+#define more_xpvnv()           S_more_xpvnv(aTHX)
+#define more_xpvcv()           S_more_xpvcv(aTHX)
+#define more_xpvav()           S_more_xpvav(aTHX)
+#define more_xpvhv()           S_more_xpvhv(aTHX)
+#define more_xpvmg()           S_more_xpvmg(aTHX)
+#define more_xpvlv()           S_more_xpvlv(aTHX)
+#define more_xpvbm()           S_more_xpvbm(aTHX)
 #define more_xrv()             S_more_xrv(aTHX)
 #define new_xiv()              S_new_xiv(aTHX)
 #define new_xnv()              S_new_xnv(aTHX)
 #define new_xpv()              S_new_xpv(aTHX)
+#define new_xpviv()            S_new_xpviv(aTHX)
+#define new_xpvnv()            S_new_xpvnv(aTHX)
+#define new_xpvcv()            S_new_xpvcv(aTHX)
+#define new_xpvav()            S_new_xpvav(aTHX)
+#define new_xpvhv()            S_new_xpvhv(aTHX)
+#define new_xpvmg()            S_new_xpvmg(aTHX)
+#define new_xpvlv()            S_new_xpvlv(aTHX)
+#define new_xpvbm()            S_new_xpvbm(aTHX)
 #define new_xrv()              S_new_xrv(aTHX)
 #define del_xiv(a)             S_del_xiv(aTHX_ a)
 #define del_xnv(a)             S_del_xnv(aTHX_ a)
 #define del_xpv(a)             S_del_xpv(aTHX_ a)
+#define del_xpviv(a)           S_del_xpviv(aTHX_ a)
+#define del_xpvnv(a)           S_del_xpvnv(aTHX_ a)
+#define del_xpvcv(a)           S_del_xpvcv(aTHX_ a)
+#define del_xpvav(a)           S_del_xpvav(aTHX_ a)
+#define del_xpvhv(a)           S_del_xpvhv(aTHX_ a)
+#define del_xpvmg(a)           S_del_xpvmg(aTHX_ a)
+#define del_xpvlv(a)           S_del_xpvlv(aTHX_ a)
+#define del_xpvbm(a)           S_del_xpvbm(aTHX_ a)
 #define del_xrv(a)             S_del_xrv(aTHX_ a)
 #define sv_unglob(a)           S_sv_unglob(aTHX_ a)
-#define do_report_used(a)      S_do_report_used(aTHX_ a)
-#define do_clean_objs(a)       S_do_clean_objs(aTHX_ a)
-#define do_clean_named_objs(a) S_do_clean_named_objs(aTHX_ a)
-#define do_clean_all(a)                S_do_clean_all(aTHX_ a)
 #define not_a_number(a)                S_not_a_number(aTHX_ a)
 #define visit(a)               S_visit(aTHX_ a)
 #  if defined(PURIFY)
 #define scan_ident(a,b,c,d,e)  S_scan_ident(aTHX_ a,b,c,d,e)
 #define scan_inputsymbol(a)    S_scan_inputsymbol(aTHX_ a)
 #define scan_pat(a,b)          S_scan_pat(aTHX_ a,b)
-#define scan_str(a)            S_scan_str(aTHX_ a)
+#define scan_str(a,b,c)                S_scan_str(aTHX_ a,b,c)
 #define scan_subst(a)          S_scan_subst(aTHX_ a)
 #define scan_trans(a)          S_scan_trans(aTHX_ a)
 #define scan_word(a,b,c,d,e)   S_scan_word(aTHX_ a,b,c,d,e)
 #define incl_perldb()          S_incl_perldb(aTHX)
 #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)
-#define restore_rsfp(a)                S_restore_rsfp(aTHX_ a)
-#define restore_expect(a)      S_restore_expect(aTHX_ a)
-#define restore_lex_expect(a)  S_restore_lex_expect(aTHX_ a)
 #  if defined(CRIPPLED_CC)
 #define uni(a,b)               S_uni(aTHX_ a,b)
 #  endif
 #endif
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
 #define mess_alloc()           S_mess_alloc(aTHX)
-#define do_croak(a,b)          S_do_croak(aTHX_ a,b)
-#define do_warn(a,b)           S_do_warn(aTHX_ a,b)
-#define do_die(a,b)            S_do_die(aTHX_ a,b)
 #  if defined(LEAKTEST)
 #define xstat(a)               S_xstat(aTHX_ a)
 #  endif
 #define ck_glob(a)             Perl_ck_glob(aTHX_ a)
 #define ck_grep(a)             Perl_ck_grep(aTHX_ a)
 #define ck_index(a)            Perl_ck_index(aTHX_ a)
+#define ck_join(a)             Perl_ck_join(aTHX_ a)
 #define ck_lengthconst(a)      Perl_ck_lengthconst(aTHX_ a)
 #define ck_lfun(a)             Perl_ck_lfun(aTHX_ a)
 #define ck_listiob(a)          Perl_ck_listiob(aTHX_ a)
 #define ck_match(a)            Perl_ck_match(aTHX_ a)
+#define ck_method(a)           Perl_ck_method(aTHX_ a)
 #define ck_null(a)             Perl_ck_null(aTHX_ a)
 #define ck_repeat(a)           Perl_ck_repeat(aTHX_ a)
 #define ck_require(a)          Perl_ck_require(aTHX_ a)
 #define pp_leaveeval()         Perl_pp_leaveeval(aTHX)
 #define pp_leaveloop()         Perl_pp_leaveloop(aTHX)
 #define pp_leavesub()          Perl_pp_leavesub(aTHX)
+#define pp_leavesublv()                Perl_pp_leavesublv(aTHX)
 #define pp_leavetry()          Perl_pp_leavetry(aTHX)
 #define pp_leavewrite()                Perl_pp_leavewrite(aTHX)
 #define pp_left_shift()                Perl_pp_left_shift(aTHX)
 #define pp_mapwhile()          Perl_pp_mapwhile(aTHX)
 #define pp_match()             Perl_pp_match(aTHX)
 #define pp_method()            Perl_pp_method(aTHX)
+#define pp_method_named()      Perl_pp_method_named(aTHX)
 #define pp_mkdir()             Perl_pp_mkdir(aTHX)
 #define pp_modulo()            Perl_pp_modulo(aTHX)
 #define pp_msgctl()            Perl_pp_msgctl(aTHX)
 #define pp_seq()               Perl_pp_seq(aTHX)
 #define pp_setpgrp()           Perl_pp_setpgrp(aTHX)
 #define pp_setpriority()       Perl_pp_setpriority(aTHX)
+#define pp_setstate()          Perl_pp_setstate(aTHX)
 #define pp_sge()               Perl_pp_sge(aTHX)
 #define pp_sgrent()            Perl_pp_sgrent(aTHX)
 #define pp_sgt()               Perl_pp_sgt(aTHX)
 #define append_list            Perl_append_list
 #define Perl_apply             CPerlObj::Perl_apply
 #define apply                  Perl_apply
-#define Perl_assertref         CPerlObj::Perl_assertref
-#define assertref              Perl_assertref
 #define Perl_avhv_exists_ent   CPerlObj::Perl_avhv_exists_ent
 #define avhv_exists_ent                Perl_avhv_exists_ent
 #define Perl_avhv_fetch_ent    CPerlObj::Perl_avhv_fetch_ent
 #define convert                        Perl_convert
 #define Perl_croak             CPerlObj::Perl_croak
 #define croak                  Perl_croak
+#define Perl_vcroak            CPerlObj::Perl_vcroak
+#define vcroak                 Perl_vcroak
 #if defined(PERL_IMPLICIT_CONTEXT)
 #define Perl_croak_nocontext   CPerlObj::Perl_croak_nocontext
 #define croak_nocontext                Perl_croak_nocontext
 #define Perl_die_nocontext     CPerlObj::Perl_die_nocontext
 #define die_nocontext          Perl_die_nocontext
+#define Perl_deb_nocontext     CPerlObj::Perl_deb_nocontext
+#define deb_nocontext          Perl_deb_nocontext
 #define Perl_form_nocontext    CPerlObj::Perl_form_nocontext
 #define form_nocontext         Perl_form_nocontext
+#define Perl_mess_nocontext    CPerlObj::Perl_mess_nocontext
+#define mess_nocontext         Perl_mess_nocontext
 #define Perl_warn_nocontext    CPerlObj::Perl_warn_nocontext
 #define warn_nocontext         Perl_warn_nocontext
+#define Perl_warner_nocontext  CPerlObj::Perl_warner_nocontext
+#define warner_nocontext       Perl_warner_nocontext
 #define Perl_newSVpvf_nocontext        CPerlObj::Perl_newSVpvf_nocontext
 #define newSVpvf_nocontext     Perl_newSVpvf_nocontext
 #define Perl_sv_catpvf_nocontext       CPerlObj::Perl_sv_catpvf_nocontext
 #define sv_catpvf_mg_nocontext Perl_sv_catpvf_mg_nocontext
 #define Perl_sv_setpvf_mg_nocontext    CPerlObj::Perl_sv_setpvf_mg_nocontext
 #define sv_setpvf_mg_nocontext Perl_sv_setpvf_mg_nocontext
+#define Perl_fprintf_nocontext CPerlObj::Perl_fprintf_nocontext
+#define fprintf_nocontext      Perl_fprintf_nocontext
 #endif
 #define Perl_cv_ckproto                CPerlObj::Perl_cv_ckproto
 #define cv_ckproto             Perl_cv_ckproto
 #define cxinc                  Perl_cxinc
 #define Perl_deb               CPerlObj::Perl_deb
 #define deb                    Perl_deb
+#define Perl_vdeb              CPerlObj::Perl_vdeb
+#define vdeb                   Perl_vdeb
 #define Perl_deb_growlevel     CPerlObj::Perl_deb_growlevel
 #define deb_growlevel          Perl_deb_growlevel
 #define Perl_debprofdump       CPerlObj::Perl_debprofdump
 #define deprecate              Perl_deprecate
 #define Perl_die               CPerlObj::Perl_die
 #define die                    Perl_die
+#define Perl_vdie              CPerlObj::Perl_vdie
+#define vdie                   Perl_vdie
 #define Perl_die_where         CPerlObj::Perl_die_where
 #define die_where              Perl_die_where
 #define Perl_dounwind          CPerlObj::Perl_dounwind
 #define dounwind               Perl_dounwind
 #define Perl_do_aexec          CPerlObj::Perl_do_aexec
 #define do_aexec               Perl_do_aexec
+#define Perl_do_aexec5         CPerlObj::Perl_do_aexec5
+#define do_aexec5              Perl_do_aexec5
 #define Perl_do_binmode                CPerlObj::Perl_do_binmode
 #define do_binmode             Perl_do_binmode
 #define Perl_do_chop           CPerlObj::Perl_do_chop
 #define do_kv                  Perl_do_kv
 #define Perl_do_open           CPerlObj::Perl_do_open
 #define do_open                        Perl_do_open
+#define Perl_do_open9          CPerlObj::Perl_do_open9
+#define do_open9               Perl_do_open9
 #define Perl_do_pipe           CPerlObj::Perl_do_pipe
 #define do_pipe                        Perl_do_pipe
 #define Perl_do_print          CPerlObj::Perl_do_print
 #define do_tell                        Perl_do_tell
 #define Perl_do_trans          CPerlObj::Perl_do_trans
 #define do_trans               Perl_do_trans
+#define Perl_do_vecget         CPerlObj::Perl_do_vecget
+#define do_vecget              Perl_do_vecget
 #define Perl_do_vecset         CPerlObj::Perl_do_vecset
 #define do_vecset              Perl_do_vecset
 #define Perl_do_vop            CPerlObj::Perl_do_vop
 #define fold_constants         Perl_fold_constants
 #define Perl_form              CPerlObj::Perl_form
 #define form                   Perl_form
+#define Perl_vform             CPerlObj::Perl_vform
+#define vform                  Perl_vform
 #define Perl_free_tmps         CPerlObj::Perl_free_tmps
 #define free_tmps              Perl_free_tmps
 #define Perl_gen_constant_list CPerlObj::Perl_gen_constant_list
 #define ibcmp_locale           Perl_ibcmp_locale
 #define Perl_ingroup           CPerlObj::Perl_ingroup
 #define ingroup                        Perl_ingroup
+#define Perl_init_debugger     CPerlObj::Perl_init_debugger
+#define init_debugger          Perl_init_debugger
 #define Perl_init_stacks       CPerlObj::Perl_init_stacks
 #define init_stacks            Perl_init_stacks
 #define Perl_intro_my          CPerlObj::Perl_intro_my
 #endif
 #define Perl_mess              CPerlObj::Perl_mess
 #define mess                   Perl_mess
+#define Perl_vmess             CPerlObj::Perl_vmess
+#define vmess                  Perl_vmess
+#define Perl_qerror            CPerlObj::Perl_qerror
+#define qerror                 Perl_qerror
 #define Perl_mg_clear          CPerlObj::Perl_mg_clear
 #define mg_clear               Perl_mg_clear
 #define Perl_mg_copy           CPerlObj::Perl_mg_copy
 #define newSVpvn               Perl_newSVpvn
 #define Perl_newSVpvf          CPerlObj::Perl_newSVpvf
 #define newSVpvf               Perl_newSVpvf
+#define Perl_vnewSVpvf         CPerlObj::Perl_vnewSVpvf
+#define vnewSVpvf              Perl_vnewSVpvf
 #define Perl_newSVrv           CPerlObj::Perl_newSVrv
 #define newSVrv                        Perl_newSVrv
 #define Perl_newSVsv           CPerlObj::Perl_newSVsv
 #define newUNOP                        Perl_newUNOP
 #define Perl_newWHILEOP                CPerlObj::Perl_newWHILEOP
 #define newWHILEOP             Perl_newWHILEOP
-#if defined(USE_THREADS)
-#define Perl_new_struct_thread CPerlObj::Perl_new_struct_thread
-#define new_struct_thread      Perl_new_struct_thread
-#endif
 #define Perl_new_stackinfo     CPerlObj::Perl_new_stackinfo
 #define new_stackinfo          Perl_new_stackinfo
 #define Perl_nextargv          CPerlObj::Perl_nextargv
 #define perl_free              CPerlObj::perl_free
 #define perl_run               CPerlObj::perl_run
 #define perl_parse             CPerlObj::perl_parse
+#if defined(USE_THREADS)
+#define Perl_new_struct_thread CPerlObj::Perl_new_struct_thread
+#define new_struct_thread      Perl_new_struct_thread
+#endif
 #endif
 #define Perl_call_atexit       CPerlObj::Perl_call_atexit
 #define call_atexit            Perl_call_atexit
 #define sv_bless               Perl_sv_bless
 #define Perl_sv_catpvf         CPerlObj::Perl_sv_catpvf
 #define sv_catpvf              Perl_sv_catpvf
+#define Perl_sv_vcatpvf                CPerlObj::Perl_sv_vcatpvf
+#define sv_vcatpvf             Perl_sv_vcatpvf
 #define Perl_sv_catpv          CPerlObj::Perl_sv_catpv
 #define sv_catpv               Perl_sv_catpv
 #define Perl_sv_catpvn         CPerlObj::Perl_sv_catpvn
 #define sv_reset               Perl_sv_reset
 #define Perl_sv_setpvf         CPerlObj::Perl_sv_setpvf
 #define sv_setpvf              Perl_sv_setpvf
+#define Perl_sv_vsetpvf                CPerlObj::Perl_sv_vsetpvf
+#define sv_vsetpvf             Perl_sv_vsetpvf
 #define Perl_sv_setiv          CPerlObj::Perl_sv_setiv
 #define sv_setiv               Perl_sv_setiv
 #define Perl_sv_setpviv                CPerlObj::Perl_sv_setpviv
 #define wait4pid               Perl_wait4pid
 #define Perl_warn              CPerlObj::Perl_warn
 #define warn                   Perl_warn
+#define Perl_vwarn             CPerlObj::Perl_vwarn
+#define vwarn                  Perl_vwarn
 #define Perl_warner            CPerlObj::Perl_warner
 #define warner                 Perl_warner
+#define Perl_vwarner           CPerlObj::Perl_vwarner
+#define vwarner                        Perl_vwarner
 #define Perl_watch             CPerlObj::Perl_watch
 #define watch                  Perl_watch
 #define Perl_whichsig          CPerlObj::Perl_whichsig
 #define Perl_GetVars           CPerlObj::Perl_GetVars
 #define GetVars                        Perl_GetVars
 #endif
-#define Perl_yydestruct                CPerlObj::Perl_yydestruct
-#define yydestruct             Perl_yydestruct
 #define Perl_runops_standard   CPerlObj::Perl_runops_standard
 #define runops_standard                Perl_runops_standard
 #define Perl_runops_debug      CPerlObj::Perl_runops_debug
 #define runops_debug           Perl_runops_debug
-#if defined(WIN32)
-#if defined(PERL_OBJECT)
-#define Perl_ErrorNo           CPerlObj::Perl_ErrorNo
-#define ErrorNo                        Perl_ErrorNo
-#else
-#define Perl_ErrorNo           CPerlObj::Perl_ErrorNo
-#define ErrorNo                        Perl_ErrorNo
-#endif
-#endif
 #define Perl_sv_catpvf_mg      CPerlObj::Perl_sv_catpvf_mg
 #define sv_catpvf_mg           Perl_sv_catpvf_mg
+#define Perl_sv_vcatpvf_mg     CPerlObj::Perl_sv_vcatpvf_mg
+#define sv_vcatpvf_mg          Perl_sv_vcatpvf_mg
 #define Perl_sv_catpv_mg       CPerlObj::Perl_sv_catpv_mg
 #define sv_catpv_mg            Perl_sv_catpv_mg
 #define Perl_sv_catpvn_mg      CPerlObj::Perl_sv_catpvn_mg
 #define sv_catsv_mg            Perl_sv_catsv_mg
 #define Perl_sv_setpvf_mg      CPerlObj::Perl_sv_setpvf_mg
 #define sv_setpvf_mg           Perl_sv_setpvf_mg
+#define Perl_sv_vsetpvf_mg     CPerlObj::Perl_sv_vsetpvf_mg
+#define sv_vsetpvf_mg          Perl_sv_vsetpvf_mg
 #define Perl_sv_setiv_mg       CPerlObj::Perl_sv_setiv_mg
 #define sv_setiv_mg            Perl_sv_setiv_mg
 #define Perl_sv_setpviv_mg     CPerlObj::Perl_sv_setpviv_mg
 #define pv_display             Perl_pv_display
 #define Perl_dump_indent       CPerlObj::Perl_dump_indent
 #define dump_indent            Perl_dump_indent
+#define Perl_dump_vindent      CPerlObj::Perl_dump_vindent
+#define dump_vindent           Perl_dump_vindent
 #define Perl_do_gv_dump                CPerlObj::Perl_do_gv_dump
 #define do_gv_dump             Perl_do_gv_dump
 #define Perl_do_gvgv_dump      CPerlObj::Perl_do_gvgv_dump
 #define magic_dump             Perl_magic_dump
 #define Perl_default_protect   CPerlObj::Perl_default_protect
 #define default_protect                Perl_default_protect
+#define Perl_vdefault_protect  CPerlObj::Perl_vdefault_protect
+#define vdefault_protect       Perl_vdefault_protect
 #define Perl_reginitcolors     CPerlObj::Perl_reginitcolors
 #define reginitcolors          Perl_reginitcolors
 #define Perl_sv_2pv_nolen      CPerlObj::Perl_sv_2pv_nolen
 #define sv_rvweaken            Perl_sv_rvweaken
 #define Perl_magic_killbackrefs        CPerlObj::Perl_magic_killbackrefs
 #define magic_killbackrefs     Perl_magic_killbackrefs
+#define Perl_newANONATTRSUB    CPerlObj::Perl_newANONATTRSUB
+#define newANONATTRSUB         Perl_newANONATTRSUB
+#define Perl_newATTRSUB                CPerlObj::Perl_newATTRSUB
+#define newATTRSUB             Perl_newATTRSUB
+#define Perl_newMYSUB          CPerlObj::Perl_newMYSUB
+#define newMYSUB               Perl_newMYSUB
+#define Perl_my_attrs          CPerlObj::Perl_my_attrs
+#define my_attrs               Perl_my_attrs
+#define Perl_boot_core_xsutils CPerlObj::Perl_boot_core_xsutils
+#define boot_core_xsutils      Perl_boot_core_xsutils
 #if defined(PERL_OBJECT)
 #endif
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 #define magic_methpack         S_magic_methpack
 #define S_magic_methcall       CPerlObj::S_magic_methcall
 #define magic_methcall         S_magic_methcall
-#define S_unwind_handler_stack CPerlObj::S_unwind_handler_stack
-#define unwind_handler_stack   S_unwind_handler_stack
-#define S_restore_magic                CPerlObj::S_restore_magic
-#define restore_magic          S_restore_magic
 #endif
 #if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT)
 #define S_list_assignment      CPerlObj::S_list_assignment
 #define list_assignment                S_list_assignment
 #define S_bad_type             CPerlObj::S_bad_type
 #define bad_type               S_bad_type
+#define S_cop_free             CPerlObj::S_cop_free
+#define cop_free               S_cop_free
 #define S_modkids              CPerlObj::S_modkids
 #define modkids                        S_modkids
 #define S_no_bareword_allowed  CPerlObj::S_no_bareword_allowed
 #define too_few_arguments      S_too_few_arguments
 #define S_too_many_arguments   CPerlObj::S_too_many_arguments
 #define too_many_arguments     S_too_many_arguments
+#define S_op_clear             CPerlObj::S_op_clear
+#define op_clear               S_op_clear
 #define S_null                 CPerlObj::S_null
 #define null                   S_null
 #define S_pad_findlex          CPerlObj::S_pad_findlex
 #define cv_clone2              S_cv_clone2
 #define S_scalar_mod_type      CPerlObj::S_scalar_mod_type
 #define scalar_mod_type                S_scalar_mod_type
+#define S_my_kid               CPerlObj::S_my_kid
+#define my_kid                 S_my_kid
+#define S_dup_attrlist         CPerlObj::S_dup_attrlist
+#define dup_attrlist           S_dup_attrlist
+#define S_apply_attrs          CPerlObj::S_apply_attrs
+#define apply_attrs            S_apply_attrs
 #  if defined(PL_OP_SLAB_ALLOC)
 #define S_Slab_Alloc           CPerlObj::S_Slab_Alloc
 #define Slab_Alloc             S_Slab_Alloc
 #define init_interp            S_init_interp
 #define S_init_ids             CPerlObj::S_init_ids
 #define init_ids               S_init_ids
-#define S_init_debugger                CPerlObj::S_init_debugger
-#define init_debugger          S_init_debugger
 #define S_init_lexer           CPerlObj::S_init_lexer
 #define init_lexer             S_init_lexer
 #define S_init_main_stash      CPerlObj::S_init_main_stash
 #define doopen_pmc             S_doopen_pmc
 #define S_qsortsv              CPerlObj::S_qsortsv
 #define qsortsv                        S_qsortsv
-#define S_sortcv               CPerlObj::S_sortcv
-#define sortcv                 S_sortcv
-#define S_sv_ncmp              CPerlObj::S_sv_ncmp
-#define sv_ncmp                        S_sv_ncmp
-#define S_sv_i_ncmp            CPerlObj::S_sv_i_ncmp
-#define sv_i_ncmp              S_sv_i_ncmp
-#define S_amagic_ncmp          CPerlObj::S_amagic_ncmp
-#define amagic_ncmp            S_amagic_ncmp
-#define S_amagic_i_ncmp                CPerlObj::S_amagic_i_ncmp
-#define amagic_i_ncmp          S_amagic_i_ncmp
-#define S_amagic_cmp           CPerlObj::S_amagic_cmp
-#define amagic_cmp             S_amagic_cmp
-#define S_amagic_cmp_locale    CPerlObj::S_amagic_cmp_locale
-#define amagic_cmp_locale      S_amagic_cmp_locale
 #endif
 #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT)
 #define S_get_db_sub           CPerlObj::S_get_db_sub
 #define get_db_sub             S_get_db_sub
-#  if defined(USE_THREADS)
-#define S_unset_cvowner                CPerlObj::S_unset_cvowner
-#define unset_cvowner          S_unset_cvowner
-#  endif
+#define S_method_common                CPerlObj::S_method_common
+#define method_common          S_method_common
 #endif
 #if defined(PERL_IN_PP_SYS_C) || defined(PERL_DECL_PROT)
 #define S_doform               CPerlObj::S_doform
 #define regatom                        S_regatom
 #define S_regbranch            CPerlObj::S_regbranch
 #define regbranch              S_regbranch
-#define S_regc                 CPerlObj::S_regc
-#define regc                   S_regc
 #define S_reguni               CPerlObj::S_reguni
 #define reguni                 S_reguni
 #define S_regclass             CPerlObj::S_regclass
 #define regpposixcc            S_regpposixcc
 #define S_checkposixcc         CPerlObj::S_checkposixcc
 #define checkposixcc           S_checkposixcc
-#define S_clear_re             CPerlObj::S_clear_re
-#define clear_re               S_clear_re
 #endif
 #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT)
 #define S_regmatch             CPerlObj::S_regmatch
 #define regcp_set_to           S_regcp_set_to
 #define S_cache_re             CPerlObj::S_cache_re
 #define cache_re               S_cache_re
-#define S_restore_pos          CPerlObj::S_restore_pos
-#define restore_pos            S_restore_pos
 #define S_reghop               CPerlObj::S_reghop
 #define reghop                 S_reghop
 #define S_reghopmaybe          CPerlObj::S_reghopmaybe
 #define more_xnv               S_more_xnv
 #define S_more_xpv             CPerlObj::S_more_xpv
 #define more_xpv               S_more_xpv
+#define S_more_xpviv           CPerlObj::S_more_xpviv
+#define more_xpviv             S_more_xpviv
+#define S_more_xpvnv           CPerlObj::S_more_xpvnv
+#define more_xpvnv             S_more_xpvnv
+#define S_more_xpvcv           CPerlObj::S_more_xpvcv
+#define more_xpvcv             S_more_xpvcv
+#define S_more_xpvav           CPerlObj::S_more_xpvav
+#define more_xpvav             S_more_xpvav
+#define S_more_xpvhv           CPerlObj::S_more_xpvhv
+#define more_xpvhv             S_more_xpvhv
+#define S_more_xpvmg           CPerlObj::S_more_xpvmg
+#define more_xpvmg             S_more_xpvmg
+#define S_more_xpvlv           CPerlObj::S_more_xpvlv
+#define more_xpvlv             S_more_xpvlv
+#define S_more_xpvbm           CPerlObj::S_more_xpvbm
+#define more_xpvbm             S_more_xpvbm
 #define S_more_xrv             CPerlObj::S_more_xrv
 #define more_xrv               S_more_xrv
 #define S_new_xiv              CPerlObj::S_new_xiv
 #define new_xnv                        S_new_xnv
 #define S_new_xpv              CPerlObj::S_new_xpv
 #define new_xpv                        S_new_xpv
+#define S_new_xpviv            CPerlObj::S_new_xpviv
+#define new_xpviv              S_new_xpviv
+#define S_new_xpvnv            CPerlObj::S_new_xpvnv
+#define new_xpvnv              S_new_xpvnv
+#define S_new_xpvcv            CPerlObj::S_new_xpvcv
+#define new_xpvcv              S_new_xpvcv
+#define S_new_xpvav            CPerlObj::S_new_xpvav
+#define new_xpvav              S_new_xpvav
+#define S_new_xpvhv            CPerlObj::S_new_xpvhv
+#define new_xpvhv              S_new_xpvhv
+#define S_new_xpvmg            CPerlObj::S_new_xpvmg
+#define new_xpvmg              S_new_xpvmg
+#define S_new_xpvlv            CPerlObj::S_new_xpvlv
+#define new_xpvlv              S_new_xpvlv
+#define S_new_xpvbm            CPerlObj::S_new_xpvbm
+#define new_xpvbm              S_new_xpvbm
 #define S_new_xrv              CPerlObj::S_new_xrv
 #define new_xrv                        S_new_xrv
 #define S_del_xiv              CPerlObj::S_del_xiv
 #define del_xnv                        S_del_xnv
 #define S_del_xpv              CPerlObj::S_del_xpv
 #define del_xpv                        S_del_xpv
+#define S_del_xpviv            CPerlObj::S_del_xpviv
+#define del_xpviv              S_del_xpviv
+#define S_del_xpvnv            CPerlObj::S_del_xpvnv
+#define del_xpvnv              S_del_xpvnv
+#define S_del_xpvcv            CPerlObj::S_del_xpvcv
+#define del_xpvcv              S_del_xpvcv
+#define S_del_xpvav            CPerlObj::S_del_xpvav
+#define del_xpvav              S_del_xpvav
+#define S_del_xpvhv            CPerlObj::S_del_xpvhv
+#define del_xpvhv              S_del_xpvhv
+#define S_del_xpvmg            CPerlObj::S_del_xpvmg
+#define del_xpvmg              S_del_xpvmg
+#define S_del_xpvlv            CPerlObj::S_del_xpvlv
+#define del_xpvlv              S_del_xpvlv
+#define S_del_xpvbm            CPerlObj::S_del_xpvbm
+#define del_xpvbm              S_del_xpvbm
 #define S_del_xrv              CPerlObj::S_del_xrv
 #define del_xrv                        S_del_xrv
 #define S_sv_unglob            CPerlObj::S_sv_unglob
 #define sv_unglob              S_sv_unglob
-#define S_do_report_used       CPerlObj::S_do_report_used
-#define do_report_used         S_do_report_used
-#define S_do_clean_objs                CPerlObj::S_do_clean_objs
-#define do_clean_objs          S_do_clean_objs
-#define S_do_clean_named_objs  CPerlObj::S_do_clean_named_objs
-#define do_clean_named_objs    S_do_clean_named_objs
-#define S_do_clean_all         CPerlObj::S_do_clean_all
-#define do_clean_all           S_do_clean_all
 #define S_not_a_number         CPerlObj::S_not_a_number
 #define not_a_number           S_not_a_number
 #define S_visit                        CPerlObj::S_visit
 #define utf16_textfilter       S_utf16_textfilter
 #define S_utf16rev_textfilter  CPerlObj::S_utf16rev_textfilter
 #define utf16rev_textfilter    S_utf16rev_textfilter
-#define S_restore_rsfp         CPerlObj::S_restore_rsfp
-#define restore_rsfp           S_restore_rsfp
-#define S_restore_expect       CPerlObj::S_restore_expect
-#define restore_expect         S_restore_expect
-#define S_restore_lex_expect   CPerlObj::S_restore_lex_expect
-#define restore_lex_expect     S_restore_lex_expect
 #  if defined(CRIPPLED_CC)
 #define S_uni                  CPerlObj::S_uni
 #define uni                    S_uni
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
 #define S_mess_alloc           CPerlObj::S_mess_alloc
 #define mess_alloc             S_mess_alloc
-#define S_do_croak             CPerlObj::S_do_croak
-#define do_croak               S_do_croak
-#define S_do_warn              CPerlObj::S_do_warn
-#define do_warn                        S_do_warn
-#define S_do_die               CPerlObj::S_do_die
-#define do_die                 S_do_die
 #  if defined(LEAKTEST)
 #define S_xstat                        CPerlObj::S_xstat
 #define xstat                  S_xstat
 #define ck_grep                        Perl_ck_grep
 #define Perl_ck_index          CPerlObj::Perl_ck_index
 #define ck_index               Perl_ck_index
+#define Perl_ck_join           CPerlObj::Perl_ck_join
+#define ck_join                        Perl_ck_join
 #define Perl_ck_lengthconst    CPerlObj::Perl_ck_lengthconst
 #define ck_lengthconst         Perl_ck_lengthconst
 #define Perl_ck_lfun           CPerlObj::Perl_ck_lfun
 #define ck_listiob             Perl_ck_listiob
 #define Perl_ck_match          CPerlObj::Perl_ck_match
 #define ck_match               Perl_ck_match
+#define Perl_ck_method         CPerlObj::Perl_ck_method
+#define ck_method              Perl_ck_method
 #define Perl_ck_null           CPerlObj::Perl_ck_null
 #define ck_null                        Perl_ck_null
 #define Perl_ck_repeat         CPerlObj::Perl_ck_repeat
 #define pp_leaveloop           Perl_pp_leaveloop
 #define Perl_pp_leavesub       CPerlObj::Perl_pp_leavesub
 #define pp_leavesub            Perl_pp_leavesub
+#define Perl_pp_leavesublv     CPerlObj::Perl_pp_leavesublv
+#define pp_leavesublv          Perl_pp_leavesublv
 #define Perl_pp_leavetry       CPerlObj::Perl_pp_leavetry
 #define pp_leavetry            Perl_pp_leavetry
 #define Perl_pp_leavewrite     CPerlObj::Perl_pp_leavewrite
 #define pp_match               Perl_pp_match
 #define Perl_pp_method         CPerlObj::Perl_pp_method
 #define pp_method              Perl_pp_method
+#define Perl_pp_method_named   CPerlObj::Perl_pp_method_named
+#define pp_method_named                Perl_pp_method_named
 #define Perl_pp_mkdir          CPerlObj::Perl_pp_mkdir
 #define pp_mkdir               Perl_pp_mkdir
 #define Perl_pp_modulo         CPerlObj::Perl_pp_modulo
 #define pp_setpgrp             Perl_pp_setpgrp
 #define Perl_pp_setpriority    CPerlObj::Perl_pp_setpriority
 #define pp_setpriority         Perl_pp_setpriority
+#define Perl_pp_setstate       CPerlObj::Perl_pp_setstate
+#define pp_setstate            Perl_pp_setstate
 #define Perl_pp_sge            CPerlObj::Perl_pp_sge
 #define pp_sge                 Perl_pp_sge
 #define Perl_pp_sgrent         CPerlObj::Perl_pp_sgrent
    disable them.
  */
 
-#if !defined(PERL_CORE) && !defined(PERL_NOCOMPAT)
-
-#  define sv_setptrobj(rv,ptr,name)    sv_setref_iv(rv,name,(IV)ptr)
-#  define sv_setptrref(rv,ptr)         sv_setref_iv(rv,Nullch,(IV)ptr)
+#if !defined(PERL_CORE)
+#  define sv_setptrobj(rv,ptr,name)    sv_setref_iv(rv,name,PTR2IV(ptr))
+#  define sv_setptrref(rv,ptr)         sv_setref_iv(rv,Nullch,PTR2IV(ptr))
+#endif
 
+#if !defined(PERL_CORE) && !defined(PERL_NOCOMPAT) && !defined(PERL_BINCOMPAT_5005)
 
 /* Compatibility for various misnamed functions.  All functions
    in the API that begin with "perl_" (not "Perl_") take an explicit
    an extra argument but grab the context pointer using the macro
    dTHX.
  */
-#if defined(PERL_IMPLICIT_CONTEXT)
+#if defined(PERL_IMPLICIT_CONTEXT) && !defined(PERL_OBJECT)
 #  define croak                                Perl_croak_nocontext
+#  define deb                          Perl_deb_nocontext
 #  define die                          Perl_die_nocontext
 #  define form                         Perl_form_nocontext
+#  define mess                         Perl_mess_nocontext
 #  define newSVpvf                     Perl_newSVpvf_nocontext
 #  define sv_catpvf                    Perl_sv_catpvf_nocontext
 #  define sv_setpvf                    Perl_sv_setpvf_nocontext
 #  define warn                         Perl_warn_nocontext
+#  define warner                       Perl_warner_nocontext
 #  define sv_catpvf_mg                 Perl_sv_catpvf_mg_nocontext
 #  define sv_setpvf_mg                 Perl_sv_setpvf_mg_nocontext
 #endif
 /* undefined symbols, point them back at the usual ones */
 #  define Perl_croak_nocontext         Perl_croak
 #  define Perl_die_nocontext           Perl_die
+#  define Perl_deb_nocontext           Perl_deb
 #  define Perl_form_nocontext          Perl_form
-#  define Perl_newSVpvf_nocontext              Perl_newSVpvf
-#  define Perl_sv_catpvf_nocontext             Perl_sv_catpvf
-#  define Perl_sv_setpvf_nocontext             Perl_sv_setpvf
+#  define Perl_mess_nocontext          Perl_mess
+#  define Perl_newSVpvf_nocontext      Perl_newSVpvf
+#  define Perl_sv_catpvf_nocontext     Perl_sv_catpvf
+#  define Perl_sv_setpvf_nocontext     Perl_sv_setpvf
 #  define Perl_warn_nocontext          Perl_warn
+#  define Perl_warner_nocontext                Perl_warner
 #  define Perl_sv_catpvf_mg_nocontext  Perl_sv_catpvf_mg
 #  define Perl_sv_setpvf_mg_nocontext  Perl_sv_setpvf_mg
 #endif