#define deprecate_old Perl_deprecate_old
#endif
#define die Perl_die
+#if defined(PERL_IN_UTIL_C)
#ifdef PERL_CORE
#define vdie S_vdie
+#endif
+#endif
+#ifdef PERL_CORE
#define die_where Perl_die_where
#endif
#define dounwind Perl_dounwind
#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
#define magic_set_all_env Perl_magic_set_all_env
#define magic_sizepack Perl_magic_sizepack
#define magic_wipepack Perl_magic_wipepack
-#define magicname Perl_magicname
#endif
#define markstack_grow Perl_markstack_grow
#if defined(USE_LOCALE_COLLATE)
#define pad_sv Perl_pad_sv
#ifdef PERL_CORE
#define pad_free Perl_pad_free
-#define pad_reset Perl_pad_reset
+#endif
+#if defined(PERL_IN_PAD_C)
+#ifdef PERL_CORE
+#define pad_reset S_pad_reset
+#endif
+#endif
+#ifdef PERL_CORE
#define pad_swipe Perl_pad_swipe
#define peep Perl_peep
#endif
#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)
+#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)
#ifdef PERL_CORE
-#define refkids Perl_refkids
+#define refkids S_refkids
+#endif
#endif
#define regdump Perl_regdump
#define regdump Perl_regdump
#define deprecate(a) Perl_deprecate(aTHX_ a)
#define deprecate_old(a) Perl_deprecate_old(aTHX_ a)
#endif
+#if defined(PERL_IN_UTIL_C)
#ifdef PERL_CORE
#define vdie(a,b) S_vdie(aTHX_ a,b)
+#endif
+#endif
+#ifdef PERL_CORE
#define die_where(a,b) Perl_die_where(aTHX_ a,b)
#endif
#define dounwind(a) Perl_dounwind(aTHX_ a)
#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)
#define magic_set_all_env(a,b) Perl_magic_set_all_env(aTHX_ a,b)
#define magic_sizepack(a,b) Perl_magic_sizepack(aTHX_ a,b)
#define magic_wipepack(a,b) Perl_magic_wipepack(aTHX_ a,b)
-#define magicname(a,b,c) Perl_magicname(aTHX_ a,b,c)
#endif
#define markstack_grow() Perl_markstack_grow(aTHX)
#if defined(USE_LOCALE_COLLATE)
#define pad_sv(a) Perl_pad_sv(aTHX_ a)
#ifdef PERL_CORE
#define pad_free(a) Perl_pad_free(aTHX_ a)
-#define pad_reset() Perl_pad_reset(aTHX)
+#endif
+#if defined(PERL_IN_PAD_C)
+#ifdef PERL_CORE
+#define pad_reset() S_pad_reset(aTHX)
+#endif
+#endif
+#ifdef PERL_CORE
#define pad_swipe(a,b) Perl_pad_swipe(aTHX_ a,b)
#define peep(a) Perl_peep(aTHX_ a)
#endif
#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)
+#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)
#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)