X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=0a12dcda6b85781523b3318b9d993ffbdc73d84b;hb=27713a047c8e9e901eeddf0155f554c629a9f4a4;hp=7ce30b9aca0c1590df203056fb51617093383faf;hpb=36ed54254cbe91c6051630e3440813400d44c456;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embed.h b/embed.h index 7ce30b9..0a12dcd 100644 --- a/embed.h +++ b/embed.h @@ -671,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 @@ -695,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 @@ -967,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 @@ -1124,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 @@ -1175,6 +1177,7 @@ #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 @@ -2177,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) @@ -2201,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) @@ -2345,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 @@ -2466,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) @@ -2622,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) @@ -2673,6 +2678,7 @@ #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) @@ -3082,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 @@ -4277,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 @@ -4327,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 @@ -4825,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 @@ -5107,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 @@ -5195,6 +5203,8 @@ #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)