#define scan_version Perl_scan_version
#define new_version Perl_new_version
#define upg_version Perl_upg_version
+#define vverify Perl_vverify
#define vnumify Perl_vnumify
#define vnormal Perl_vnormal
#define vstringify Perl_vstringify
#define setdefout Perl_setdefout
#endif
#define share_hek Perl_share_hek
+#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
#ifdef PERL_CORE
#define sighandler Perl_sighandler
#endif
#define csighandler Perl_csighandler
+#else
+#ifdef PERL_CORE
+#define sighandler Perl_sighandler
+#endif
+#define csighandler Perl_csighandler
+#endif
#define stack_grow Perl_stack_grow
#define start_subparse Perl_start_subparse
#ifdef PERL_CORE
#define div128 S_div128
#define group_end S_group_end
#define get_num S_get_num
+#define need_utf8 S_need_utf8
+#define first_symbol S_first_symbol
#endif
#endif
#if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT)
#endif
#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
#ifdef PERL_CORE
+#define uiv_2buf S_uiv_2buf
#define asIV S_asIV
#define asUV S_asUV
#define sv_unglob S_sv_unglob
#define sublex_start S_sublex_start
#define filter_gets S_filter_gets
#define find_in_my_stash S_find_in_my_stash
+#define tokenize_use S_tokenize_use
#define new_constant S_new_constant
#endif
# if defined(DEBUGGING)
#define depcom S_depcom
#define incl_perldb S_incl_perldb
#endif
-#if 0
-#ifdef PERL_CORE
-#define utf16_textfilter S_utf16_textfilter
-#define utf16rev_textfilter S_utf16rev_textfilter
-#endif
-#endif
# if defined(PERL_CR_FILTER)
#ifdef PERL_CORE
#define cr_textfilter S_cr_textfilter
#ifdef PERL_CORE
#define closest_cop S_closest_cop
#define mess_alloc S_mess_alloc
+#define vdie_croak_common S_vdie_croak_common
+#define vdie_common S_vdie_common
#endif
#endif
#if defined(PERL_IN_NUMERIC_C) || defined(PERL_DECL_PROT)
#define scan_version(a,b,c) Perl_scan_version(aTHX_ a,b,c)
#define new_version(a) Perl_new_version(aTHX_ a)
#define upg_version(a) Perl_upg_version(aTHX_ a)
+#define vverify(a) Perl_vverify(aTHX_ a)
#define vnumify(a) Perl_vnumify(aTHX_ a)
#define vnormal(a) Perl_vnormal(aTHX_ a)
#define vstringify(a) Perl_vstringify(aTHX_ a)
#define setdefout(a) Perl_setdefout(aTHX_ a)
#endif
#define share_hek(a,b,c) Perl_share_hek(aTHX_ a,b,c)
+#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
+#ifdef PERL_CORE
+#endif
+#else
#ifdef PERL_CORE
#define sighandler Perl_sighandler
#endif
#define csighandler Perl_csighandler
+#endif
#define stack_grow(a,b,c) Perl_stack_grow(aTHX_ a,b,c)
#define start_subparse(a,b) Perl_start_subparse(aTHX_ a,b)
#ifdef PERL_CORE
#define div128(a,b) S_div128(aTHX_ a,b)
#define group_end(a,b,c) S_group_end(aTHX_ a,b,c)
#define get_num(a,b) S_get_num(aTHX_ a,b)
+#define need_utf8 S_need_utf8
+#define first_symbol S_first_symbol
#endif
#endif
#if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT)
#endif
#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
#ifdef PERL_CORE
+#define uiv_2buf S_uiv_2buf
#define asIV(a) S_asIV(aTHX_ a)
#define asUV(a) S_asUV(aTHX_ a)
#define sv_unglob(a) S_sv_unglob(aTHX_ a)
#define sublex_start() S_sublex_start(aTHX)
#define filter_gets(a,b,c) S_filter_gets(aTHX_ a,b,c)
#define find_in_my_stash(a,b) S_find_in_my_stash(aTHX_ a,b)
+#define tokenize_use(a,b) S_tokenize_use(aTHX_ a,b)
#define new_constant(a,b,c,d,e,f) S_new_constant(aTHX_ a,b,c,d,e,f)
#endif
# if defined(DEBUGGING)
#define depcom() S_depcom(aTHX)
#define incl_perldb() S_incl_perldb(aTHX)
#endif
-#if 0
-#ifdef PERL_CORE
-#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)
-#endif
-#endif
# if defined(PERL_CR_FILTER)
#ifdef PERL_CORE
#define cr_textfilter(a,b,c) S_cr_textfilter(aTHX_ a,b,c)
#ifdef PERL_CORE
#define closest_cop(a,b) S_closest_cop(aTHX_ a,b)
#define mess_alloc() S_mess_alloc(aTHX)
+#define vdie_croak_common(a,b,c,d) S_vdie_croak_common(aTHX_ a,b,c,d)
+#define vdie_common(a,b,c) S_vdie_common(aTHX_ a,b,c)
#endif
#endif
#if defined(PERL_IN_NUMERIC_C) || defined(PERL_DECL_PROT)