X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=984bc66e90c0ed87a5d51bde7398c5b03e52a772;hb=137d6fc09ef3595c225f4474cf527a89e2099776;hp=18b117a11ab517d88800e0e156d9bd53a7742ae6;hpb=14f338dc60207c41838439f6f09615a0c4c9bf39;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embed.h b/embed.h index 18b117a..984bc66 100644 --- a/embed.h +++ b/embed.h @@ -409,6 +409,7 @@ #define is_uni_xdigit_lc Perl_is_uni_xdigit_lc #define is_utf8_char Perl_is_utf8_char #define is_utf8_string Perl_is_utf8_string +#define is_utf8_string_loc Perl_is_utf8_string_loc #define is_utf8_alnum Perl_is_utf8_alnum #define is_utf8_alnumc Perl_is_utf8_alnumc #define is_utf8_idfirst Perl_is_utf8_idfirst @@ -967,13 +968,13 @@ #define sv_2bool Perl_sv_2bool #define sv_2cv Perl_sv_2cv #define sv_2io Perl_sv_2io -#define sv_2iv Perl_sv_2iv +#define sv_2iv_flags Perl_sv_2iv_flags #define sv_2mortal Perl_sv_2mortal #define sv_2nv Perl_sv_2nv #define sv_2pvutf8 Perl_sv_2pvutf8 #define sv_2pvbyte Perl_sv_2pvbyte #define sv_pvn_nomg Perl_sv_pvn_nomg -#define sv_2uv Perl_sv_2uv +#define sv_2uv_flags Perl_sv_2uv_flags #define sv_iv Perl_sv_iv #define sv_uv Perl_sv_uv #define sv_nv Perl_sv_nv @@ -1312,9 +1313,6 @@ #define share_hek_flags S_share_hek_flags #endif #ifdef PERL_CORE -#define hv_fetch_flags S_hv_fetch_flags -#endif -#ifdef PERL_CORE #define hv_notallowed S_hv_notallowed #endif #endif @@ -1387,14 +1385,10 @@ #ifdef PERL_CORE #define apply_attrs_my S_apply_attrs_my #endif -# if defined(PL_OP_SLAB_ALLOC) -#ifdef PERL_CORE -#define Slab_Alloc S_Slab_Alloc #endif -#ifdef PERL_CORE -#define Slab_Free S_Slab_Free -#endif -# endif +#if defined(PL_OP_SLAB_ALLOC) +#define Slab_Alloc Perl_Slab_Alloc +#define Slab_Free Perl_Slab_Free #endif #if defined(PERL_IN_PERL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE @@ -1530,6 +1524,9 @@ #define doparseform S_doparseform #endif #ifdef PERL_CORE +#define num_overflow S_num_overflow +#endif +#ifdef PERL_CORE #define dopoptoeval S_dopoptoeval #endif #ifdef PERL_CORE @@ -2056,7 +2053,7 @@ #define my_atof2 Perl_my_atof2 #define my_socketpair Perl_my_socketpair #ifdef PERL_COPY_ON_WRITE -#ifdef PERL_CORE +#if defined(PERL_CORE) || defined(PERL_EXT) #define sv_setsv_cow Perl_sv_setsv_cow #endif #endif @@ -2149,6 +2146,19 @@ #endif #endif #define save_set_svflags Perl_save_set_svflags +#if defined(PERL_IN_HV_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define hv_delete_common S_hv_delete_common +#endif +#ifdef PERL_CORE +#define hv_fetch_common S_hv_fetch_common +#endif +#endif +#define hv_clear_placeholders Perl_hv_clear_placeholders +#define hv_scalar Perl_hv_scalar +#ifdef PERL_CORE +#define magic_scalarpack Perl_magic_scalarpack +#endif #define ck_anoncode Perl_ck_anoncode #define ck_bitop Perl_ck_bitop #define ck_concat Perl_ck_concat @@ -2188,6 +2198,7 @@ #define ck_substr Perl_ck_substr #define ck_svconst Perl_ck_svconst #define ck_trunc Perl_ck_trunc +#define ck_unpack Perl_ck_unpack #define pp_aassign Perl_pp_aassign #define pp_abs Perl_pp_abs #define pp_accept Perl_pp_accept @@ -2903,6 +2914,7 @@ #define is_uni_xdigit_lc(a) Perl_is_uni_xdigit_lc(aTHX_ a) #define is_utf8_char(a) Perl_is_utf8_char(aTHX_ a) #define is_utf8_string(a,b) Perl_is_utf8_string(aTHX_ a,b) +#define is_utf8_string_loc(a,b,c) Perl_is_utf8_string_loc(aTHX_ a,b,c) #define is_utf8_alnum(a) Perl_is_utf8_alnum(aTHX_ a) #define is_utf8_alnumc(a) Perl_is_utf8_alnumc(aTHX_ a) #define is_utf8_idfirst(a) Perl_is_utf8_idfirst(aTHX_ a) @@ -3224,7 +3236,7 @@ #define newWHILEOP(a,b,c,d,e,f,g) Perl_newWHILEOP(aTHX_ a,b,c,d,e,f,g) #define new_stackinfo(a,b) Perl_new_stackinfo(aTHX_ a,b) #define scan_vstring(a,b) Perl_scan_vstring(aTHX_ a,b) -#define scan_version(a,b) Perl_scan_version(aTHX_ a,b) +#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 vnumify(a) Perl_vnumify(aTHX_ a) @@ -3459,13 +3471,13 @@ #define sv_2bool(a) Perl_sv_2bool(aTHX_ a) #define sv_2cv(a,b,c,d) Perl_sv_2cv(aTHX_ a,b,c,d) #define sv_2io(a) Perl_sv_2io(aTHX_ a) -#define sv_2iv(a) Perl_sv_2iv(aTHX_ a) +#define sv_2iv_flags(a,b) Perl_sv_2iv_flags(aTHX_ a,b) #define sv_2mortal(a) Perl_sv_2mortal(aTHX_ a) #define sv_2nv(a) Perl_sv_2nv(aTHX_ a) #define sv_2pvutf8(a,b) Perl_sv_2pvutf8(aTHX_ a,b) #define sv_2pvbyte(a,b) Perl_sv_2pvbyte(aTHX_ a,b) #define sv_pvn_nomg(a,b) Perl_sv_pvn_nomg(aTHX_ a,b) -#define sv_2uv(a) Perl_sv_2uv(aTHX_ a) +#define sv_2uv_flags(a,b) Perl_sv_2uv_flags(aTHX_ a,b) #define sv_iv(a) Perl_sv_iv(aTHX_ a) #define sv_uv(a) Perl_sv_uv(aTHX_ a) #define sv_nv(a) Perl_sv_nv(aTHX_ a) @@ -3798,9 +3810,6 @@ #define share_hek_flags(a,b,c,d) S_share_hek_flags(aTHX_ a,b,c,d) #endif #ifdef PERL_CORE -#define hv_fetch_flags(a,b,c,d,e) S_hv_fetch_flags(aTHX_ a,b,c,d,e) -#endif -#ifdef PERL_CORE #define hv_notallowed(a,b,c,d) S_hv_notallowed(aTHX_ a,b,c,d) #endif #endif @@ -3873,14 +3882,10 @@ #ifdef PERL_CORE #define apply_attrs_my(a,b,c,d) S_apply_attrs_my(aTHX_ a,b,c,d) #endif -# if defined(PL_OP_SLAB_ALLOC) -#ifdef PERL_CORE -#define Slab_Alloc(a,b) S_Slab_Alloc(aTHX_ a,b) #endif -#ifdef PERL_CORE -#define Slab_Free(a) S_Slab_Free(aTHX_ a) -#endif -# endif +#if defined(PL_OP_SLAB_ALLOC) +#define Slab_Alloc(a,b) Perl_Slab_Alloc(aTHX_ a,b) +#define Slab_Free(a) Perl_Slab_Free(aTHX_ a) #endif #if defined(PERL_IN_PERL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE @@ -4016,6 +4021,9 @@ #define doparseform(a) S_doparseform(aTHX_ a) #endif #ifdef PERL_CORE +#define num_overflow S_num_overflow +#endif +#ifdef PERL_CORE #define dopoptoeval(a) S_dopoptoeval(aTHX_ a) #endif #ifdef PERL_CORE @@ -4541,7 +4549,7 @@ #define my_atof2(a,b) Perl_my_atof2(aTHX_ a,b) #define my_socketpair Perl_my_socketpair #ifdef PERL_COPY_ON_WRITE -#ifdef PERL_CORE +#if defined(PERL_CORE) || defined(PERL_EXT) #define sv_setsv_cow(a,b) Perl_sv_setsv_cow(aTHX_ a,b) #endif #endif @@ -4634,6 +4642,19 @@ #endif #endif #define save_set_svflags(a,b,c) Perl_save_set_svflags(aTHX_ a,b,c) +#if defined(PERL_IN_HV_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define hv_delete_common(a,b,c,d,e,f,g) S_hv_delete_common(aTHX_ a,b,c,d,e,f,g) +#endif +#ifdef PERL_CORE +#define hv_fetch_common(a,b,c,d,e,f,g,h) S_hv_fetch_common(aTHX_ a,b,c,d,e,f,g,h) +#endif +#endif +#define hv_clear_placeholders(a) Perl_hv_clear_placeholders(aTHX_ a) +#define hv_scalar(a) Perl_hv_scalar(aTHX_ a) +#ifdef PERL_CORE +#define magic_scalarpack(a,b) Perl_magic_scalarpack(aTHX_ a,b) +#endif #define ck_anoncode(a) Perl_ck_anoncode(aTHX_ a) #define ck_bitop(a) Perl_ck_bitop(aTHX_ a) #define ck_concat(a) Perl_ck_concat(aTHX_ a) @@ -4673,6 +4694,7 @@ #define ck_substr(a) Perl_ck_substr(aTHX_ a) #define ck_svconst(a) Perl_ck_svconst(aTHX_ a) #define ck_trunc(a) Perl_ck_trunc(aTHX_ a) +#define ck_unpack(a) Perl_ck_unpack(aTHX_ a) #define pp_aassign() Perl_pp_aassign(aTHX) #define pp_abs() Perl_pp_abs(aTHX) #define pp_accept() Perl_pp_accept(aTHX)