#define block_gimme Perl_block_gimme
#define block_start Perl_block_start
#define boot_core_UNIVERSAL Perl_boot_core_UNIVERSAL
+#define boot_core_PerlIO Perl_boot_core_PerlIO
#define call_list Perl_call_list
#define cando Perl_cando
#define cast_ulong Perl_cast_ulong
#define vload_module Perl_vload_module
#define localize Perl_localize
#define looks_like_number Perl_looks_like_number
+#define grok_number Perl_grok_number
+#define grok_numeric_radix Perl_grok_numeric_radix
#define magic_clearenv Perl_magic_clearenv
#define magic_clear_all_env Perl_magic_clear_all_env
#define magic_clearpack Perl_magic_clearpack
#define moreswitches Perl_moreswitches
#define my Perl_my
#define my_atof Perl_my_atof
-#if !defined(HAS_BCOPY) || !defined(HAS_SAFE_BCOPY)
+#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
#define my_bcopy Perl_my_bcopy
#endif
#if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
#define del_sv S_del_sv
# endif
# if !defined(NV_PRESERVES_UV)
-#define sv_2inuv_non_preserve S_sv_2inuv_non_preserve
#define sv_2iuv_non_preserve S_sv_2iuv_non_preserve
# endif
#define expect_number S_expect_number
#if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT)
#define isa_lookup S_isa_lookup
#endif
-#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
#define stdize_locale S_stdize_locale
+#endif
+#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
#define mess_alloc S_mess_alloc
# if defined(LEAKTEST)
#define xstat S_xstat
#define ck_exit Perl_ck_exit
#define ck_ftst Perl_ck_ftst
#define ck_fun Perl_ck_fun
-#define ck_fun_locale Perl_ck_fun_locale
#define ck_glob Perl_ck_glob
#define ck_grep Perl_ck_grep
#define ck_index Perl_ck_index
#define ck_rfun Perl_ck_rfun
#define ck_rvconst Perl_ck_rvconst
#define ck_sassign Perl_ck_sassign
-#define ck_scmp Perl_ck_scmp
#define ck_select Perl_ck_select
#define ck_shift Perl_ck_shift
#define ck_sort Perl_ck_sort
#define block_gimme() Perl_block_gimme(aTHX)
#define block_start(a) Perl_block_start(aTHX_ a)
#define boot_core_UNIVERSAL() Perl_boot_core_UNIVERSAL(aTHX)
+#define boot_core_PerlIO() Perl_boot_core_PerlIO(aTHX)
#define call_list(a,b) Perl_call_list(aTHX_ a,b)
#define cando(a,b,c) Perl_cando(aTHX_ a,b,c)
#define cast_ulong(a) Perl_cast_ulong(aTHX_ a)
#define vload_module(a,b,c,d) Perl_vload_module(aTHX_ a,b,c,d)
#define localize(a,b) Perl_localize(aTHX_ a,b)
#define looks_like_number(a) Perl_looks_like_number(aTHX_ a)
+#define grok_number(a,b,c) Perl_grok_number(aTHX_ a,b,c)
+#define grok_numeric_radix(a,b) Perl_grok_numeric_radix(aTHX_ a,b)
#define magic_clearenv(a,b) Perl_magic_clearenv(aTHX_ a,b)
#define magic_clear_all_env(a,b) Perl_magic_clear_all_env(aTHX_ a,b)
#define magic_clearpack(a,b) Perl_magic_clearpack(aTHX_ a,b)
#define moreswitches(a) Perl_moreswitches(aTHX_ a)
#define my(a) Perl_my(aTHX_ a)
#define my_atof(a) Perl_my_atof(aTHX_ a)
-#if !defined(HAS_BCOPY) || !defined(HAS_SAFE_BCOPY)
+#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
#define my_bcopy Perl_my_bcopy
#endif
#if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
#define del_sv(a) S_del_sv(aTHX_ a)
# endif
# if !defined(NV_PRESERVES_UV)
-#define sv_2inuv_non_preserve(a,b) S_sv_2inuv_non_preserve(aTHX_ a,b)
#define sv_2iuv_non_preserve(a,b) S_sv_2iuv_non_preserve(aTHX_ a,b)
# endif
#define expect_number(a) S_expect_number(aTHX_ a)
#if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT)
#define isa_lookup(a,b,c,d) S_isa_lookup(aTHX_ a,b,c,d)
#endif
-#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
#define stdize_locale(a) S_stdize_locale(aTHX_ a)
+#endif
+#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
#define mess_alloc() S_mess_alloc(aTHX)
# if defined(LEAKTEST)
#define xstat(a) S_xstat(aTHX_ a)
#define ck_exit(a) Perl_ck_exit(aTHX_ a)
#define ck_ftst(a) Perl_ck_ftst(aTHX_ a)
#define ck_fun(a) Perl_ck_fun(aTHX_ a)
-#define ck_fun_locale(a) Perl_ck_fun_locale(aTHX_ a)
#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_rfun(a) Perl_ck_rfun(aTHX_ a)
#define ck_rvconst(a) Perl_ck_rvconst(aTHX_ a)
#define ck_sassign(a) Perl_ck_sassign(aTHX_ a)
-#define ck_scmp(a) Perl_ck_scmp(aTHX_ a)
#define ck_select(a) Perl_ck_select(aTHX_ a)
#define ck_shift(a) Perl_ck_shift(aTHX_ a)
#define ck_sort(a) Perl_ck_sort(aTHX_ a)
#define block_start Perl_block_start
#define Perl_boot_core_UNIVERSAL CPerlObj::Perl_boot_core_UNIVERSAL
#define boot_core_UNIVERSAL Perl_boot_core_UNIVERSAL
+#define Perl_boot_core_PerlIO CPerlObj::Perl_boot_core_PerlIO
+#define boot_core_PerlIO Perl_boot_core_PerlIO
#define Perl_call_list CPerlObj::Perl_call_list
#define call_list Perl_call_list
#define Perl_cando CPerlObj::Perl_cando
#define localize Perl_localize
#define Perl_looks_like_number CPerlObj::Perl_looks_like_number
#define looks_like_number Perl_looks_like_number
+#define Perl_grok_number CPerlObj::Perl_grok_number
+#define grok_number Perl_grok_number
+#define Perl_grok_numeric_radix CPerlObj::Perl_grok_numeric_radix
+#define grok_numeric_radix Perl_grok_numeric_radix
#define Perl_magic_clearenv CPerlObj::Perl_magic_clearenv
#define magic_clearenv Perl_magic_clearenv
#define Perl_magic_clear_all_env CPerlObj::Perl_magic_clear_all_env
#define my Perl_my
#define Perl_my_atof CPerlObj::Perl_my_atof
#define my_atof Perl_my_atof
-#if !defined(HAS_BCOPY) || !defined(HAS_SAFE_BCOPY)
+#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
#define Perl_my_bcopy CPerlObj::Perl_my_bcopy
#define my_bcopy Perl_my_bcopy
#endif
#define del_sv S_del_sv
# endif
# if !defined(NV_PRESERVES_UV)
-#define S_sv_2inuv_non_preserve CPerlObj::S_sv_2inuv_non_preserve
-#define sv_2inuv_non_preserve S_sv_2inuv_non_preserve
#define S_sv_2iuv_non_preserve CPerlObj::S_sv_2iuv_non_preserve
#define sv_2iuv_non_preserve S_sv_2iuv_non_preserve
# endif
#define S_isa_lookup CPerlObj::S_isa_lookup
#define isa_lookup S_isa_lookup
#endif
-#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
#define S_stdize_locale CPerlObj::S_stdize_locale
#define stdize_locale S_stdize_locale
+#endif
+#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
#define S_mess_alloc CPerlObj::S_mess_alloc
#define mess_alloc S_mess_alloc
# if defined(LEAKTEST)
#define ck_ftst Perl_ck_ftst
#define Perl_ck_fun CPerlObj::Perl_ck_fun
#define ck_fun Perl_ck_fun
-#define Perl_ck_fun_locale CPerlObj::Perl_ck_fun_locale
-#define ck_fun_locale Perl_ck_fun_locale
#define Perl_ck_glob CPerlObj::Perl_ck_glob
#define ck_glob Perl_ck_glob
#define Perl_ck_grep CPerlObj::Perl_ck_grep
#define ck_rvconst Perl_ck_rvconst
#define Perl_ck_sassign CPerlObj::Perl_ck_sassign
#define ck_sassign Perl_ck_sassign
-#define Perl_ck_scmp CPerlObj::Perl_ck_scmp
-#define ck_scmp Perl_ck_scmp
#define Perl_ck_select CPerlObj::Perl_ck_select
#define ck_select Perl_ck_select
#define Perl_ck_shift CPerlObj::Perl_ck_shift