X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=0a12dcda6b85781523b3318b9d993ffbdc73d84b;hb=27713a047c8e9e901eeddf0155f554c629a9f4a4;hp=2e67e3650a266654ca7bde62e3516c30dd3384f8;hpb=ead56f575ba85493a3f4d8d929bb3146a76daa02;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embed.h b/embed.h index 2e67e36..0a12dcd 100644 --- a/embed.h +++ b/embed.h @@ -101,6 +101,7 @@ #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 @@ -343,6 +344,8 @@ #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 @@ -418,7 +421,7 @@ #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) @@ -668,7 +671,7 @@ #define sv_collxfrm Perl_sv_collxfrm #endif #define sv_compile_2op Perl_sv_compile_2op -#define sv_getcwd Perl_sv_getcwd +#define getcwd_sv Perl_getcwd_sv #define sv_dec Perl_sv_dec #define sv_dump Perl_sv_dump #define sv_derived_from Perl_sv_derived_from @@ -692,7 +695,6 @@ #define sv_pos_b2u Perl_sv_pos_b2u #define sv_pvutf8n_force Perl_sv_pvutf8n_force #define sv_pvbyten_force Perl_sv_pvbyten_force -#define sv_realpath Perl_sv_realpath #define sv_reftype Perl_sv_reftype #define sv_replace Perl_sv_replace #define sv_report_used Perl_sv_report_used @@ -964,9 +966,11 @@ # endif #endif #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT) -#define doencodes S_doencodes #define refto S_refto #define seed S_seed +#endif +#if defined(PERL_IN_PP_PACK_C) || defined(PERL_DECL_PROT) +#define doencodes S_doencodes #define mul128 S_mul128 #define is_an_int S_is_an_int #define div128 S_div128 @@ -1108,14 +1112,12 @@ #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(USE_ITHREADS) #define gv_share S_gv_share # endif -#define grok_number S_grok_number #endif #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) #define check_uni S_check_uni @@ -1123,6 +1125,7 @@ #define force_version S_force_version #define force_word S_force_word #define tokeq S_tokeq +#define pending_ident S_pending_ident #define scan_const S_scan_const #define scan_formline S_scan_formline #define scan_heredoc S_scan_heredoc @@ -1170,8 +1173,11 @@ #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 closest_cop S_closest_cop #define mess_alloc S_mess_alloc # if defined(LEAKTEST) #define xstat S_xstat @@ -1627,6 +1633,7 @@ #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) @@ -1849,6 +1856,8 @@ #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) @@ -1923,7 +1932,7 @@ #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) @@ -2171,7 +2180,7 @@ #define sv_collxfrm(a,b) Perl_sv_collxfrm(aTHX_ a,b) #endif #define sv_compile_2op(a,b,c,d) Perl_sv_compile_2op(aTHX_ a,b,c,d) -#define sv_getcwd(a) Perl_sv_getcwd(aTHX_ a) +#define getcwd_sv(a) Perl_getcwd_sv(aTHX_ a) #define sv_dec(a) Perl_sv_dec(aTHX_ a) #define sv_dump(a) Perl_sv_dump(aTHX_ a) #define sv_derived_from(a,b) Perl_sv_derived_from(aTHX_ a,b) @@ -2195,7 +2204,6 @@ #define sv_pos_b2u(a,b) Perl_sv_pos_b2u(aTHX_ a,b) #define sv_pvutf8n_force(a,b) Perl_sv_pvutf8n_force(aTHX_ a,b) #define sv_pvbyten_force(a,b) Perl_sv_pvbyten_force(aTHX_ a,b) -#define sv_realpath(a,b,c) Perl_sv_realpath(aTHX_ a,b,c) #define sv_reftype(a,b) Perl_sv_reftype(aTHX_ a,b) #define sv_replace(a,b) Perl_sv_replace(aTHX_ a,b) #define sv_report_used() Perl_sv_report_used(aTHX) @@ -2339,17 +2347,17 @@ #define my_attrs(a,b) Perl_my_attrs(aTHX_ a,b) #define boot_core_xsutils() Perl_boot_core_xsutils(aTHX) #if defined(USE_ITHREADS) -#define cx_dup(a,b,c) Perl_cx_dup(aTHX_ a,b,c) -#define si_dup(a) Perl_si_dup(aTHX_ a) -#define ss_dup(a) Perl_ss_dup(aTHX_ a) +#define cx_dup(a,b,c,d) Perl_cx_dup(aTHX_ a,b,c,d) +#define si_dup(a,b) Perl_si_dup(aTHX_ a,b) +#define ss_dup(a,b) Perl_ss_dup(aTHX_ a,b) #define any_dup(a,b) Perl_any_dup(aTHX_ a,b) -#define he_dup(a,b) Perl_he_dup(aTHX_ a,b) +#define he_dup(a,b,c) Perl_he_dup(aTHX_ a,b,c) #define re_dup(a) Perl_re_dup(aTHX_ a) #define fp_dup(a,b) Perl_fp_dup(aTHX_ a,b) #define dirp_dup(a) Perl_dirp_dup(aTHX_ a) -#define gp_dup(a) Perl_gp_dup(aTHX_ a) -#define mg_dup(a) Perl_mg_dup(aTHX_ a) -#define sv_dup(a) Perl_sv_dup(aTHX_ a) +#define gp_dup(a,b) Perl_gp_dup(aTHX_ a,b) +#define mg_dup(a,b) Perl_mg_dup(aTHX_ a,b) +#define sv_dup(a,b) Perl_sv_dup(aTHX_ a,b) #if defined(HAVE_INTERP_INTERN) #define sys_intern_dup(a,b) Perl_sys_intern_dup(aTHX_ a,b) #endif @@ -2460,9 +2468,11 @@ # endif #endif #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT) -#define doencodes(a,b,c) S_doencodes(aTHX_ a,b,c) #define refto(a) S_refto(aTHX_ a) #define seed() S_seed(aTHX) +#endif +#if defined(PERL_IN_PP_PACK_C) || defined(PERL_DECL_PROT) +#define doencodes(a,b,c) S_doencodes(aTHX_ a,b,c) #define mul128(a,b) S_mul128(aTHX_ a,b) #define is_an_int(a,b) S_is_an_int(aTHX_ a,b) #define div128(a,b) S_div128(aTHX_ a,b) @@ -2603,14 +2613,12 @@ #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(USE_ITHREADS) #define gv_share(a) S_gv_share(aTHX_ a) # endif -#define grok_number(a,b,c) S_grok_number(aTHX_ a,b,c) #endif #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) #define check_uni() S_check_uni(aTHX) @@ -2618,6 +2626,7 @@ #define force_version(a) S_force_version(aTHX_ a) #define force_word(a,b,c,d,e) S_force_word(aTHX_ a,b,c,d,e) #define tokeq(a) S_tokeq(aTHX_ a) +#define pending_ident() S_pending_ident(aTHX) #define scan_const(a) S_scan_const(aTHX_ a) #define scan_formline(a) S_scan_formline(aTHX_ a) #define scan_heredoc(a) S_scan_heredoc(aTHX_ a) @@ -2665,8 +2674,11 @@ #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 closest_cop(a,b) S_closest_cop(aTHX_ a,b) #define mess_alloc() S_mess_alloc(aTHX) # if defined(LEAKTEST) #define xstat(a) S_xstat(aTHX_ a) @@ -3076,11 +3088,11 @@ # if defined(PERL_IMPLICIT_SYS) # endif #endif -#if defined(MYMALLOC) #define malloc Perl_malloc #define calloc Perl_calloc #define realloc Perl_realloc #define mfree Perl_mfree +#if defined(MYMALLOC) #define malloced_size Perl_malloced_size #endif #define get_context Perl_get_context @@ -3162,6 +3174,8 @@ #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 @@ -3630,6 +3644,10 @@ #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 @@ -3774,7 +3792,7 @@ #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 @@ -4265,8 +4283,8 @@ #endif #define Perl_sv_compile_2op CPerlObj::Perl_sv_compile_2op #define sv_compile_2op Perl_sv_compile_2op -#define Perl_sv_getcwd CPerlObj::Perl_sv_getcwd -#define sv_getcwd Perl_sv_getcwd +#define Perl_getcwd_sv CPerlObj::Perl_getcwd_sv +#define getcwd_sv Perl_getcwd_sv #define Perl_sv_dec CPerlObj::Perl_sv_dec #define sv_dec Perl_sv_dec #define Perl_sv_dump CPerlObj::Perl_sv_dump @@ -4315,8 +4333,6 @@ #define sv_pvutf8n_force Perl_sv_pvutf8n_force #define Perl_sv_pvbyten_force CPerlObj::Perl_sv_pvbyten_force #define sv_pvbyten_force Perl_sv_pvbyten_force -#define Perl_sv_realpath CPerlObj::Perl_sv_realpath -#define sv_realpath Perl_sv_realpath #define Perl_sv_reftype CPerlObj::Perl_sv_reftype #define sv_reftype Perl_sv_reftype #define Perl_sv_replace CPerlObj::Perl_sv_replace @@ -4813,12 +4829,14 @@ # endif #endif #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT) -#define S_doencodes CPerlObj::S_doencodes -#define doencodes S_doencodes #define S_refto CPerlObj::S_refto #define refto S_refto #define S_seed CPerlObj::S_seed #define seed S_seed +#endif +#if defined(PERL_IN_PP_PACK_C) || defined(PERL_DECL_PROT) +#define S_doencodes CPerlObj::S_doencodes +#define doencodes S_doencodes #define S_mul128 CPerlObj::S_mul128 #define mul128 S_mul128 #define S_is_an_int CPerlObj::S_is_an_int @@ -5074,8 +5092,6 @@ #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 @@ -5085,8 +5101,6 @@ #define S_gv_share CPerlObj::S_gv_share #define gv_share S_gv_share # endif -#define S_grok_number CPerlObj::S_grok_number -#define grok_number S_grok_number #endif #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) #define S_check_uni CPerlObj::S_check_uni @@ -5099,6 +5113,8 @@ #define force_word S_force_word #define S_tokeq CPerlObj::S_tokeq #define tokeq S_tokeq +#define S_pending_ident CPerlObj::S_pending_ident +#define pending_ident S_pending_ident #define S_scan_const CPerlObj::S_scan_const #define scan_const S_scan_const #define S_scan_formline CPerlObj::S_scan_formline @@ -5182,9 +5198,13 @@ #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_closest_cop CPerlObj::S_closest_cop +#define closest_cop S_closest_cop #define S_mess_alloc CPerlObj::S_mess_alloc #define mess_alloc S_mess_alloc # if defined(LEAKTEST)