X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=92b175e16ac814241f551fdbea4bd88962ec97cf;hb=af5683d1a11b86657bb9d3800d54c4d65ca7b5a0;hp=24c85cd1a8b2b2058d572bcb52f1a590dbfd9c13;hpb=44af46eeddcebf8498b872cce52b93562332def3;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embed.h b/embed.h index 24c85cd..92b175e 100644 --- a/embed.h +++ b/embed.h @@ -265,6 +265,7 @@ #define gv_fullname Perl_gv_fullname #define gv_fullname4 Perl_gv_fullname4 #define gv_init Perl_gv_init +#define gv_name_set Perl_gv_name_set #define gv_stashpv Perl_gv_stashpv #define gv_stashpvn Perl_gv_stashpvn #define gv_stashsv Perl_gv_stashsv @@ -404,7 +405,6 @@ #define magic_get Perl_magic_get #define magic_getarylen Perl_magic_getarylen #define magic_getdefelem Perl_magic_getdefelem -#define magic_getglob Perl_magic_getglob #define magic_getnkeys Perl_magic_getnkeys #define magic_getpack Perl_magic_getpack #define magic_getpos Perl_magic_getpos @@ -520,7 +520,11 @@ #define newASSIGNOP Perl_newASSIGNOP #define newCONDOP Perl_newCONDOP #define newCONSTSUB Perl_newCONSTSUB +#ifdef PERL_MAD #define newFORM Perl_newFORM +#else +#define newFORM Perl_newFORM +#endif #define newFOROP Perl_newFOROP #define newGIVENOP Perl_newGIVENOP #define newLOGOP Perl_newLOGOP @@ -586,8 +590,16 @@ #define oopsCV Perl_oopsCV #endif #define op_free Perl_op_free +#ifdef PERL_MAD #ifdef PERL_CORE #define package Perl_package +#endif +#else +#ifdef PERL_CORE +#define package Perl_package +#endif +#endif +#ifdef PERL_CORE #define pad_alloc Perl_pad_alloc #define allocmy Perl_allocmy #define pad_findmy Perl_pad_findmy @@ -774,6 +786,11 @@ #define sv_2bool Perl_sv_2bool #define sv_2cv Perl_sv_2cv #define sv_2io Perl_sv_2io +#ifdef PERL_IN_SV_C +#ifdef PERL_CORE +#define glob_2inpuv S_glob_2inpuv +#endif +#endif #define sv_2iv_flags Perl_sv_2iv_flags #define sv_2mortal Perl_sv_2mortal #define sv_2nv Perl_sv_2nv @@ -881,8 +898,16 @@ #define unsharepvn Perl_unsharepvn #ifdef PERL_CORE #define unshare_hek Perl_unshare_hek +#endif +#ifdef PERL_MAD +#ifdef PERL_CORE #define utilize Perl_utilize #endif +#else +#ifdef PERL_CORE +#define utilize Perl_utilize +#endif +#endif #define utf16_to_utf8 Perl_utf16_to_utf8 #define utf16_to_utf8_reversed Perl_utf16_to_utf8_reversed #define utf8_length Perl_utf8_length @@ -985,7 +1010,11 @@ #endif #define newANONATTRSUB Perl_newANONATTRSUB #define newATTRSUB Perl_newATTRSUB +#ifdef PERL_MAD #define newMYSUB Perl_newMYSUB +#else +#define newMYSUB Perl_newMYSUB +#endif #ifdef PERL_CORE #define my_attrs Perl_my_attrs #define boot_core_xsutils Perl_boot_core_xsutils @@ -1372,7 +1401,13 @@ #define sv_2iuv_common S_sv_2iuv_common #define glob_assign_glob S_glob_assign_glob #define glob_assign_ref S_glob_assign_ref +#endif +# if defined(USE_ITHREADS) +#ifdef PERL_CORE #define ptr_table_find S_ptr_table_find +#endif +# endif +#ifdef PERL_CORE #define find_hash_subscript S_find_hash_subscript #define find_array_subscript S_find_array_subscript #define find_uninit_var S_find_uninit_var @@ -1710,6 +1745,57 @@ #endif #ifdef PERL_IMPLICIT_CONTEXT #endif +#ifdef PERL_MAD +#ifdef PERL_CORE +#define pad_peg Perl_pad_peg +#endif +#if defined(PERL_IN_DUMP_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define xmldump_attr S_xmldump_attr +#endif +#endif +#ifdef PERL_CORE +#define xmldump_indent Perl_xmldump_indent +#define xmldump_vindent Perl_xmldump_vindent +#define xmldump_all Perl_xmldump_all +#define xmldump_packsubs Perl_xmldump_packsubs +#define xmldump_sub Perl_xmldump_sub +#define xmldump_form Perl_xmldump_form +#define xmldump_eval Perl_xmldump_eval +#define sv_catxmlsv Perl_sv_catxmlsv +#define sv_catxmlpvn Perl_sv_catxmlpvn +#define sv_xmlpeek Perl_sv_xmlpeek +#define do_pmop_xmldump Perl_do_pmop_xmldump +#define pmop_xmldump Perl_pmop_xmldump +#define do_op_xmldump Perl_do_op_xmldump +#define op_xmldump Perl_op_xmldump +#endif +#ifdef PERL_CORE +#define newTOKEN Perl_newTOKEN +#define token_free Perl_token_free +#define token_getmad Perl_token_getmad +#define op_getmad_weak Perl_op_getmad_weak +#define op_getmad Perl_op_getmad +#define prepend_madprops Perl_prepend_madprops +#define append_madprops Perl_append_madprops +#define addmad Perl_addmad +#define newMADsv Perl_newMADsv +#define newMADPROP Perl_newMADPROP +#define mad_free Perl_mad_free +#endif +# if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define skipspace0 S_skipspace0 +#define skipspace1 S_skipspace1 +#define skipspace2 S_skipspace2 +#define start_force S_start_force +#define curmad S_curmad +#endif +# endif +#ifdef PERL_CORE +#define madlex Perl_madlex +#endif +#endif #define ck_anoncode Perl_ck_anoncode #define ck_bitop Perl_ck_bitop #define ck_chdir Perl_ck_chdir @@ -2333,6 +2419,7 @@ #define gv_fullname(a,b) Perl_gv_fullname(aTHX_ a,b) #define gv_fullname4(a,b,c,d) Perl_gv_fullname4(aTHX_ a,b,c,d) #define gv_init(a,b,c,d,e) Perl_gv_init(aTHX_ a,b,c,d,e) +#define gv_name_set(a,b,c,d) Perl_gv_name_set(aTHX_ a,b,c,d) #define gv_stashpv(a,b) Perl_gv_stashpv(aTHX_ a,b) #define gv_stashpvn(a,b,c) Perl_gv_stashpvn(aTHX_ a,b,c) #define gv_stashsv(a,b) Perl_gv_stashsv(aTHX_ a,b) @@ -2471,7 +2558,6 @@ #define magic_get(a,b) Perl_magic_get(aTHX_ a,b) #define magic_getarylen(a,b) Perl_magic_getarylen(aTHX_ a,b) #define magic_getdefelem(a,b) Perl_magic_getdefelem(aTHX_ a,b) -#define magic_getglob(a,b) Perl_magic_getglob(aTHX_ a,b) #define magic_getnkeys(a,b) Perl_magic_getnkeys(aTHX_ a,b) #define magic_getpack(a,b) Perl_magic_getpack(aTHX_ a,b) #define magic_getpos(a,b) Perl_magic_getpos(aTHX_ a,b) @@ -2586,7 +2672,11 @@ #define newASSIGNOP(a,b,c,d) Perl_newASSIGNOP(aTHX_ a,b,c,d) #define newCONDOP(a,b,c,d) Perl_newCONDOP(aTHX_ a,b,c,d) #define newCONSTSUB(a,b,c) Perl_newCONSTSUB(aTHX_ a,b,c) +#ifdef PERL_MAD +#define newFORM(a,b,c) Perl_newFORM(aTHX_ a,b,c) +#else #define newFORM(a,b,c) Perl_newFORM(aTHX_ a,b,c) +#endif #define newFOROP(a,b,c,d,e,f,g) Perl_newFOROP(aTHX_ a,b,c,d,e,f,g) #define newGIVENOP(a,b,c) Perl_newGIVENOP(aTHX_ a,b,c) #define newLOGOP(a,b,c,d) Perl_newLOGOP(aTHX_ a,b,c,d) @@ -2651,8 +2741,16 @@ #define oopsCV(a) Perl_oopsCV(aTHX_ a) #endif #define op_free(a) Perl_op_free(aTHX_ a) +#ifdef PERL_MAD #ifdef PERL_CORE #define package(a) Perl_package(aTHX_ a) +#endif +#else +#ifdef PERL_CORE +#define package(a) Perl_package(aTHX_ a) +#endif +#endif +#ifdef PERL_CORE #define pad_alloc(a,b) Perl_pad_alloc(aTHX_ a,b) #define allocmy(a) Perl_allocmy(aTHX_ a) #define pad_findmy(a) Perl_pad_findmy(aTHX_ a) @@ -2836,6 +2934,11 @@ #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) +#ifdef PERL_IN_SV_C +#ifdef PERL_CORE +#define glob_2inpuv(a,b,c) S_glob_2inpuv(aTHX_ a,b,c) +#endif +#endif #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) @@ -2941,8 +3044,16 @@ #define unsharepvn(a,b,c) Perl_unsharepvn(aTHX_ a,b,c) #ifdef PERL_CORE #define unshare_hek(a) Perl_unshare_hek(aTHX_ a) +#endif +#ifdef PERL_MAD +#ifdef PERL_CORE +#define utilize(a,b,c,d,e) Perl_utilize(aTHX_ a,b,c,d,e) +#endif +#else +#ifdef PERL_CORE #define utilize(a,b,c,d,e) Perl_utilize(aTHX_ a,b,c,d,e) #endif +#endif #define utf16_to_utf8(a,b,c,d) Perl_utf16_to_utf8(aTHX_ a,b,c,d) #define utf16_to_utf8_reversed(a,b,c,d) Perl_utf16_to_utf8_reversed(aTHX_ a,b,c,d) #define utf8_length(a,b) Perl_utf8_length(aTHX_ a,b) @@ -3040,7 +3151,11 @@ #endif #define newANONATTRSUB(a,b,c,d) Perl_newANONATTRSUB(aTHX_ a,b,c,d) #define newATTRSUB(a,b,c,d,e) Perl_newATTRSUB(aTHX_ a,b,c,d,e) +#ifdef PERL_MAD +#define newMYSUB(a,b,c,d,e) Perl_newMYSUB(aTHX_ a,b,c,d,e) +#else #define newMYSUB(a,b,c,d,e) Perl_newMYSUB(aTHX_ a,b,c,d,e) +#endif #ifdef PERL_CORE #define my_attrs(a,b) Perl_my_attrs(aTHX_ a,b) #define boot_core_xsutils() Perl_boot_core_xsutils(aTHX) @@ -3428,11 +3543,17 @@ # endif #ifdef PERL_CORE #define more_sv() S_more_sv(aTHX) -#define more_bodies(a,b) S_more_bodies(aTHX_ a,b) +#define more_bodies(a) S_more_bodies(aTHX_ a) #define sv_2iuv_common(a) S_sv_2iuv_common(aTHX_ a) #define glob_assign_glob(a,b,c) S_glob_assign_glob(aTHX_ a,b,c) #define glob_assign_ref(a,b) S_glob_assign_ref(aTHX_ a,b) +#endif +# if defined(USE_ITHREADS) +#ifdef PERL_CORE #define ptr_table_find S_ptr_table_find +#endif +# endif +#ifdef PERL_CORE #define find_hash_subscript(a,b) S_find_hash_subscript(aTHX_ a,b) #define find_array_subscript(a,b) S_find_array_subscript(aTHX_ a,b) #define find_uninit_var(a,b,c) S_find_uninit_var(aTHX_ a,b,c) @@ -3774,6 +3895,55 @@ #endif #ifdef PERL_IMPLICIT_CONTEXT #endif +#ifdef PERL_MAD +#ifdef PERL_CORE +#define pad_peg Perl_pad_peg +#endif +#if defined(PERL_IN_DUMP_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#endif +#endif +#ifdef PERL_CORE +#define xmldump_vindent(a,b,c,d) Perl_xmldump_vindent(aTHX_ a,b,c,d) +#define xmldump_all() Perl_xmldump_all(aTHX) +#define xmldump_packsubs(a) Perl_xmldump_packsubs(aTHX_ a) +#define xmldump_sub(a) Perl_xmldump_sub(aTHX_ a) +#define xmldump_form(a) Perl_xmldump_form(aTHX_ a) +#define xmldump_eval() Perl_xmldump_eval(aTHX) +#define sv_catxmlsv(a,b) Perl_sv_catxmlsv(aTHX_ a,b) +#define sv_catxmlpvn(a,b,c,d) Perl_sv_catxmlpvn(aTHX_ a,b,c,d) +#define sv_xmlpeek(a) Perl_sv_xmlpeek(aTHX_ a) +#define do_pmop_xmldump(a,b,c) Perl_do_pmop_xmldump(aTHX_ a,b,c) +#define pmop_xmldump(a) Perl_pmop_xmldump(aTHX_ a) +#define do_op_xmldump(a,b,c) Perl_do_op_xmldump(aTHX_ a,b,c) +#define op_xmldump(a) Perl_op_xmldump(aTHX_ a) +#endif +#ifdef PERL_CORE +#define newTOKEN(a,b,c) Perl_newTOKEN(aTHX_ a,b,c) +#define token_free(a) Perl_token_free(aTHX_ a) +#define token_getmad(a,b,c) Perl_token_getmad(aTHX_ a,b,c) +#define op_getmad_weak(a,b,c) Perl_op_getmad_weak(aTHX_ a,b,c) +#define op_getmad(a,b,c) Perl_op_getmad(aTHX_ a,b,c) +#define prepend_madprops(a,b,c) Perl_prepend_madprops(aTHX_ a,b,c) +#define append_madprops(a,b,c) Perl_append_madprops(aTHX_ a,b,c) +#define addmad(a,b,c) Perl_addmad(aTHX_ a,b,c) +#define newMADsv(a,b) Perl_newMADsv(aTHX_ a,b) +#define newMADPROP(a,b,c,d) Perl_newMADPROP(aTHX_ a,b,c,d) +#define mad_free(a) Perl_mad_free(aTHX_ a) +#endif +# if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define skipspace0(a) S_skipspace0(aTHX_ a) +#define skipspace1(a) S_skipspace1(aTHX_ a) +#define skipspace2(a,b) S_skipspace2(aTHX_ a,b) +#define start_force(a) S_start_force(aTHX_ a) +#define curmad(a,b) S_curmad(aTHX_ a,b) +#endif +# endif +#ifdef PERL_CORE +#define madlex() Perl_madlex(aTHX) +#endif +#endif #define ck_anoncode(a) Perl_ck_anoncode(aTHX_ a) #define ck_bitop(a) Perl_ck_bitop(aTHX_ a) #define ck_chdir(a) Perl_ck_chdir(aTHX_ a)