X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=14dcbd7d144e224f88248644d5435e8e62a92cf0;hb=5b3035ed4d02db655cf5d2d62ab1ebb11c131def;hp=50a9d9e0711c9879898bc92d8540669d39d1d7ab;hpb=444155da6cc74bc317db82ecaa4272f5cf6d3c9b;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embed.h b/embed.h index 50a9d9e..14dcbd7 100644 --- a/embed.h +++ b/embed.h @@ -597,6 +597,7 @@ #define save_pptr Perl_save_pptr #define save_vptr Perl_save_vptr #define save_re_context Perl_save_re_context +#define save_padsv Perl_save_padsv #define save_sptr Perl_save_sptr #define save_svref Perl_save_svref #define save_threadsv Perl_save_threadsv @@ -725,12 +726,13 @@ #define utilize Perl_utilize #define utf16_to_utf8 Perl_utf16_to_utf8 #define utf16_to_utf8_reversed Perl_utf16_to_utf8_reversed +#define utf8_length Perl_utf8_length #define utf8_distance Perl_utf8_distance #define utf8_hop Perl_utf8_hop #define utf8_to_bytes Perl_utf8_to_bytes #define bytes_to_utf8 Perl_bytes_to_utf8 +#define utf8_to_uv_simple Perl_utf8_to_uv_simple #define utf8_to_uv Perl_utf8_to_uv -#define utf8_to_uv_chk Perl_utf8_to_uv_chk #define uv_to_utf8 Perl_uv_to_utf8 #define vivify_defelem Perl_vivify_defelem #define vivify_ref Perl_vivify_ref @@ -744,7 +746,8 @@ #define watch Perl_watch #define whichsig Perl_whichsig #define yyerror Perl_yyerror -#if defined(USE_PURE_BISON) +#ifdef USE_PURE_BISON +#define yylex_r Perl_yylex_r #define yylex Perl_yylex #else #define yylex Perl_yylex @@ -1134,6 +1137,7 @@ #define isa_lookup S_isa_lookup #endif #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) +#define stdize_locale S_stdize_locale #define mess_alloc S_mess_alloc # if defined(LEAKTEST) #define xstat S_xstat @@ -2058,6 +2062,7 @@ #define save_pptr(a) Perl_save_pptr(aTHX_ a) #define save_vptr(a) Perl_save_vptr(aTHX_ a) #define save_re_context() Perl_save_re_context(aTHX) +#define save_padsv(a) Perl_save_padsv(aTHX_ a) #define save_sptr(a) Perl_save_sptr(aTHX_ a) #define save_svref(a) Perl_save_svref(aTHX_ a) #define save_threadsv(a) Perl_save_threadsv(aTHX_ a) @@ -2068,7 +2073,7 @@ #define scalarvoid(a) Perl_scalarvoid(aTHX_ a) #define scan_bin(a,b,c) Perl_scan_bin(aTHX_ a,b,c) #define scan_hex(a,b,c) Perl_scan_hex(aTHX_ a,b,c) -#define scan_num(a) Perl_scan_num(aTHX_ a) +#define scan_num(a,b) Perl_scan_num(aTHX_ a,b) #define scan_oct(a,b,c) Perl_scan_oct(aTHX_ a,b,c) #define scope(a) Perl_scope(aTHX_ a) #define screaminstr(a,b,c,d,e,f) Perl_screaminstr(aTHX_ a,b,c,d,e,f) @@ -2184,12 +2189,13 @@ #define utilize(a,b,c,d,e) Perl_utilize(aTHX_ a,b,c,d,e) #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) #define utf8_distance(a,b) Perl_utf8_distance(aTHX_ a,b) #define utf8_hop(a,b) Perl_utf8_hop(aTHX_ a,b) #define utf8_to_bytes(a,b) Perl_utf8_to_bytes(aTHX_ a,b) #define bytes_to_utf8(a,b) Perl_bytes_to_utf8(aTHX_ a,b) -#define utf8_to_uv(a,b) Perl_utf8_to_uv(aTHX_ a,b) -#define utf8_to_uv_chk(a,b,c) Perl_utf8_to_uv_chk(aTHX_ a,b,c) +#define utf8_to_uv_simple(a,b) Perl_utf8_to_uv_simple(aTHX_ a,b) +#define utf8_to_uv(a,b,c,d) Perl_utf8_to_uv(aTHX_ a,b,c,d) #define uv_to_utf8(a,b) Perl_uv_to_utf8(aTHX_ a,b) #define vivify_defelem(a) Perl_vivify_defelem(aTHX_ a) #define vivify_ref(a,b) Perl_vivify_ref(aTHX_ a,b) @@ -2201,7 +2207,8 @@ #define watch(a) Perl_watch(aTHX_ a) #define whichsig(a) Perl_whichsig(aTHX_ a) #define yyerror(a) Perl_yyerror(aTHX_ a) -#if defined(USE_PURE_BISON) +#ifdef USE_PURE_BISON +#define yylex_r(a,b) Perl_yylex_r(aTHX_ a,b) #define yylex(a,b) Perl_yylex(aTHX_ a,b) #else #define yylex() Perl_yylex(aTHX) @@ -2436,34 +2443,34 @@ # endif #endif #if defined(PERL_IN_REGCOMP_C) || defined(PERL_DECL_PROT) -#define reg(a,b) S_reg(aTHX_ a,b) -#define reganode(a,b) S_reganode(aTHX_ a,b) -#define regatom(a) S_regatom(aTHX_ a) -#define regbranch(a,b) S_regbranch(aTHX_ a,b) -#define reguni(a,b,c) S_reguni(aTHX_ a,b,c) -#define regclass() S_regclass(aTHX) -#define regclassutf8() S_regclassutf8(aTHX) +#define reg(a,b,c) S_reg(aTHX_ a,b,c) +#define reganode(a,b,c) S_reganode(aTHX_ a,b,c) +#define regatom(a,b) S_regatom(aTHX_ a,b) +#define regbranch(a,b,c) S_regbranch(aTHX_ a,b,c) +#define reguni(a,b,c,d) S_reguni(aTHX_ a,b,c,d) +#define regclass(a) S_regclass(aTHX_ a) +#define regclassutf8(a) S_regclassutf8(aTHX_ a) #define regcurly(a) S_regcurly(aTHX_ a) -#define reg_node(a) S_reg_node(aTHX_ a) -#define regpiece(a) S_regpiece(aTHX_ a) -#define reginsert(a,b) S_reginsert(aTHX_ a,b) -#define regoptail(a,b) S_regoptail(aTHX_ a,b) -#define regtail(a,b) S_regtail(aTHX_ a,b) +#define reg_node(a,b) S_reg_node(aTHX_ a,b) +#define regpiece(a,b) S_regpiece(aTHX_ a,b) +#define reginsert(a,b,c) S_reginsert(aTHX_ a,b,c) +#define regoptail(a,b,c) S_regoptail(aTHX_ a,b,c) +#define regtail(a,b,c) S_regtail(aTHX_ a,b,c) #define regwhite(a,b) S_regwhite(aTHX_ a,b) -#define nextchar() S_nextchar(aTHX) +#define nextchar(a) S_nextchar(aTHX_ a) #define dumpuntil(a,b,c,d,e) S_dumpuntil(aTHX_ a,b,c,d,e) #define put_byte(a,b) S_put_byte(aTHX_ a,b) -#define scan_commit(a) S_scan_commit(aTHX_ a) -#define cl_anything(a) S_cl_anything(aTHX_ a) +#define scan_commit(a,b) S_scan_commit(aTHX_ a,b) +#define cl_anything(a,b) S_cl_anything(aTHX_ a,b) #define cl_is_anything(a) S_cl_is_anything(aTHX_ a) -#define cl_init(a) S_cl_init(aTHX_ a) -#define cl_init_zero(a) S_cl_init_zero(aTHX_ a) +#define cl_init(a,b) S_cl_init(aTHX_ a,b) +#define cl_init_zero(a,b) S_cl_init_zero(aTHX_ a,b) #define cl_and(a,b) S_cl_and(aTHX_ a,b) -#define cl_or(a,b) S_cl_or(aTHX_ a,b) -#define study_chunk(a,b,c,d,e) S_study_chunk(aTHX_ a,b,c,d,e) -#define add_data(a,b) S_add_data(aTHX_ a,b) -#define regpposixcc(a) S_regpposixcc(aTHX_ a) -#define checkposixcc() S_checkposixcc(aTHX) +#define cl_or(a,b,c) S_cl_or(aTHX_ a,b,c) +#define study_chunk(a,b,c,d,e,f) S_study_chunk(aTHX_ a,b,c,d,e,f) +#define add_data(a,b,c) S_add_data(aTHX_ a,b,c) +#define regpposixcc(a,b) S_regpposixcc(aTHX_ a,b) +#define checkposixcc(a) S_checkposixcc(aTHX_ a) #endif #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT) #define regmatch(a) S_regmatch(aTHX_ a) @@ -2586,6 +2593,7 @@ #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) +#define stdize_locale(a) S_stdize_locale(aTHX_ a) #define mess_alloc() S_mess_alloc(aTHX) # if defined(LEAKTEST) #define xstat(a) S_xstat(aTHX_ a) @@ -4032,6 +4040,8 @@ #define save_vptr Perl_save_vptr #define Perl_save_re_context CPerlObj::Perl_save_re_context #define save_re_context Perl_save_re_context +#define Perl_save_padsv CPerlObj::Perl_save_padsv +#define save_padsv Perl_save_padsv #define Perl_save_sptr CPerlObj::Perl_save_sptr #define save_sptr Perl_save_sptr #define Perl_save_svref CPerlObj::Perl_save_svref @@ -4280,6 +4290,8 @@ #define utf16_to_utf8 Perl_utf16_to_utf8 #define Perl_utf16_to_utf8_reversed CPerlObj::Perl_utf16_to_utf8_reversed #define utf16_to_utf8_reversed Perl_utf16_to_utf8_reversed +#define Perl_utf8_length CPerlObj::Perl_utf8_length +#define utf8_length Perl_utf8_length #define Perl_utf8_distance CPerlObj::Perl_utf8_distance #define utf8_distance Perl_utf8_distance #define Perl_utf8_hop CPerlObj::Perl_utf8_hop @@ -4288,10 +4300,10 @@ #define utf8_to_bytes Perl_utf8_to_bytes #define Perl_bytes_to_utf8 CPerlObj::Perl_bytes_to_utf8 #define bytes_to_utf8 Perl_bytes_to_utf8 +#define Perl_utf8_to_uv_simple CPerlObj::Perl_utf8_to_uv_simple +#define utf8_to_uv_simple Perl_utf8_to_uv_simple #define Perl_utf8_to_uv CPerlObj::Perl_utf8_to_uv #define utf8_to_uv Perl_utf8_to_uv -#define Perl_utf8_to_uv_chk CPerlObj::Perl_utf8_to_uv_chk -#define utf8_to_uv_chk Perl_utf8_to_uv_chk #define Perl_uv_to_utf8 CPerlObj::Perl_uv_to_utf8 #define uv_to_utf8 Perl_uv_to_utf8 #define Perl_vivify_defelem CPerlObj::Perl_vivify_defelem @@ -4318,7 +4330,9 @@ #define whichsig Perl_whichsig #define Perl_yyerror CPerlObj::Perl_yyerror #define yyerror Perl_yyerror -#if defined(USE_PURE_BISON) +#ifdef USE_PURE_BISON +#define Perl_yylex_r CPerlObj::Perl_yylex_r +#define yylex_r Perl_yylex_r #define Perl_yylex CPerlObj::Perl_yylex #define yylex Perl_yylex #else @@ -5019,6 +5033,8 @@ #define isa_lookup S_isa_lookup #endif #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) +#define S_stdize_locale CPerlObj::S_stdize_locale +#define stdize_locale S_stdize_locale #define S_mess_alloc CPerlObj::S_mess_alloc #define mess_alloc S_mess_alloc # if defined(LEAKTEST)