#endif
#define dowantarray Perl_dowantarray
#define dump_all Perl_dump_all
+#ifdef PERL_CORE
+#define dump_all_perl Perl_dump_all_perl
+#endif
#define dump_eval Perl_dump_eval
#if defined(DUMP_FDS)
#define dump_fds Perl_dump_fds
#define op_dump Perl_op_dump
#define pmop_dump Perl_pmop_dump
#define dump_packsubs Perl_dump_packsubs
+#ifdef PERL_CORE
+#define dump_packsubs_perl Perl_dump_packsubs_perl
+#endif
#define dump_sub Perl_dump_sub
+#ifdef PERL_CORE
+#define dump_sub_perl Perl_dump_sub_perl
+#endif
#define fbm_compile Perl_fbm_compile
#define fbm_instr Perl_fbm_instr
#ifdef PERL_CORE
#define xmldump_indent Perl_xmldump_indent
#define xmldump_vindent Perl_xmldump_vindent
#define xmldump_all Perl_xmldump_all
+#define xmldump_all_perl Perl_xmldump_all_perl
#define xmldump_packsubs Perl_xmldump_packsubs
+#define xmldump_packsubs_perl Perl_xmldump_packsubs_perl
#define xmldump_sub Perl_xmldump_sub
+#endif
+#ifdef PERL_CORE
#define xmldump_form Perl_xmldump_form
#define xmldump_eval Perl_xmldump_eval
#define sv_catxmlsv Perl_sv_catxmlsv
#define debop(a) Perl_debop(aTHX_ a)
#define debstack() Perl_debstack(aTHX)
#define debstackptrs() Perl_debstackptrs(aTHX)
-#define delimcpy(a,b,c,d,e,f) Perl_delimcpy(aTHX_ a,b,c,d,e,f)
+#define delimcpy Perl_delimcpy
#ifdef PERL_CORE
#define delete_eval_scope() Perl_delete_eval_scope(aTHX)
#define deprecate(a) Perl_deprecate(aTHX_ a)
#endif
#define dowantarray() Perl_dowantarray(aTHX)
#define dump_all() Perl_dump_all(aTHX)
+#ifdef PERL_CORE
+#define dump_all_perl(a) Perl_dump_all_perl(aTHX_ a)
+#endif
#define dump_eval() Perl_dump_eval(aTHX)
#if defined(DUMP_FDS)
#define dump_fds(a) Perl_dump_fds(aTHX_ a)
#define op_dump(a) Perl_op_dump(aTHX_ a)
#define pmop_dump(a) Perl_pmop_dump(aTHX_ a)
#define dump_packsubs(a) Perl_dump_packsubs(aTHX_ a)
+#ifdef PERL_CORE
+#define dump_packsubs_perl(a,b) Perl_dump_packsubs_perl(aTHX_ a,b)
+#endif
#define dump_sub(a) Perl_dump_sub(aTHX_ a)
+#ifdef PERL_CORE
+#define dump_sub_perl(a,b) Perl_dump_sub_perl(aTHX_ a,b)
+#endif
#define fbm_compile(a,b) Perl_fbm_compile(aTHX_ a,b)
#define fbm_instr(a,b,c,d) Perl_fbm_instr(aTHX_ a,b,c,d)
#ifdef PERL_CORE
#endif
#endif
#define hv_undef(a) Perl_hv_undef(aTHX_ a)
-#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 Perl_ibcmp
+#define ibcmp_locale Perl_ibcmp_locale
#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) || defined(PERL_DECL_PROT)
#ifdef PERL_CORE
#ifdef PERL_CORE
#define intro_my() Perl_intro_my(aTHX)
#endif
-#define instr(a,b) Perl_instr(aTHX_ a,b)
+#define instr Perl_instr
#ifdef PERL_CORE
#define io_close(a,b) Perl_io_close(aTHX_ a,b)
#define invert(a) Perl_invert(aTHX_ a)
#ifdef PERL_CORE
#define nextargv(a) Perl_nextargv(aTHX_ a)
#endif
-#define ninstr(a,b,c,d) Perl_ninstr(aTHX_ a,b,c,d)
+#define ninstr Perl_ninstr
#define op_free(a) Perl_op_free(aTHX_ a)
#ifdef PERL_MAD
#ifdef PERL_CORE
#if defined(PERL_CORE) || defined(PERL_EXT)
#define regprop(a,b,c) Perl_regprop(aTHX_ a,b,c)
#endif
-#define repeatcpy(a,b,c,d) Perl_repeatcpy(aTHX_ a,b,c,d)
-#define rninstr(a,b,c,d) Perl_rninstr(aTHX_ a,b,c,d)
+#define repeatcpy Perl_repeatcpy
+#define rninstr Perl_rninstr
#define rsignal(a,b) Perl_rsignal(aTHX_ a,b)
#ifdef PERL_CORE
#define rsignal_restore(a,b) Perl_rsignal_restore(aTHX_ a,b)
#ifdef PERL_CORE
#define xmldump_vindent(a,b,c,d) Perl_xmldump_vindent(aTHX_ a,b,c,d)
#define xmldump_all() Perl_xmldump_all(aTHX)
+#define xmldump_all_perl(a) Perl_xmldump_all_perl(aTHX_ a)
#define xmldump_packsubs(a) Perl_xmldump_packsubs(aTHX_ a)
+#define xmldump_packsubs_perl(a,b) Perl_xmldump_packsubs_perl(aTHX_ a,b)
#define xmldump_sub(a) Perl_xmldump_sub(aTHX_ a)
+#define xmldump_sub_perl(a,b) _ a,b)
#define xmldump_form(a) Perl_xmldump_form(aTHX_ a)
#define xmldump_eval() Perl_xmldump_eval(aTHX)
#define sv_catxmlsv(a,b) Perl_sv_catxmlsv(aTHX_ a,b)