X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=3f3b668bbb618ac6956687c72165a362d28427e5;hb=0bcc34c2b0b0cb62c0df3d5e562b779fb96595ba;hp=338fc14f4cdd8ee5d634b9794f41434702f324c4;hpb=e4dba78629baadf544a977b8105c4c2d93050b21;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embed.h b/embed.h index 338fc14..3f3b668 100644 --- a/embed.h +++ b/embed.h @@ -155,7 +155,6 @@ #endif #define dounwind Perl_dounwind #ifdef PERL_CORE -#define do_aexec Perl_do_aexec #define do_aexec5 Perl_do_aexec5 #endif #define do_binmode Perl_do_binmode @@ -165,8 +164,13 @@ #define do_close Perl_do_close #ifdef PERL_CORE #define do_eof Perl_do_eof +#endif +#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION +#else +#ifdef PERL_CORE #define do_exec Perl_do_exec #endif +#endif #if defined(WIN32) || defined(__SYMBIAN32__) #define do_aspawn Perl_do_aspawn #define do_spawn Perl_do_spawn @@ -255,7 +259,6 @@ #define gv_fetchfile Perl_gv_fetchfile #define gv_fetchmeth Perl_gv_fetchmeth #define gv_fetchmeth_autoload Perl_gv_fetchmeth_autoload -#define gv_fetchmethod Perl_gv_fetchmethod #define gv_fetchmethod_autoload Perl_gv_fetchmethod_autoload #define gv_fetchpv Perl_gv_fetchpv #define gv_fullname Perl_gv_fullname @@ -276,12 +279,10 @@ #define hv_iterinit Perl_hv_iterinit #define hv_iterkey Perl_hv_iterkey #define hv_iterkeysv Perl_hv_iterkeysv -#define hv_iternext Perl_hv_iternext #define hv_iternextsv Perl_hv_iternextsv #define hv_iternext_flags Perl_hv_iternext_flags #define hv_iterval Perl_hv_iterval #define hv_ksplit Perl_hv_ksplit -#define hv_magic Perl_hv_magic #define hv_store Perl_hv_store #define hv_store_ent Perl_hv_store_ent #define hv_store_flags Perl_hv_store_flags @@ -343,7 +344,6 @@ #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_string_loclen Perl_is_utf8_string_loclen #define is_utf8_alnum Perl_is_utf8_alnum #define is_utf8_alnumc Perl_is_utf8_alnumc @@ -890,10 +890,15 @@ #define bytes_to_utf8 Perl_bytes_to_utf8 #define utf8_to_uvchr Perl_utf8_to_uvchr #define utf8_to_uvuni Perl_utf8_to_uvuni +#ifdef EBCDIC #define utf8n_to_uvchr Perl_utf8n_to_uvchr +#else +#endif #define utf8n_to_uvuni Perl_utf8n_to_uvuni +#ifdef EBCDIC #define uvchr_to_utf8 Perl_uvchr_to_utf8 -#define uvuni_to_utf8 Perl_uvuni_to_utf8 +#else +#endif #define uvchr_to_utf8_flags Perl_uvchr_to_utf8_flags #define uvuni_to_utf8_flags Perl_uvuni_to_utf8_flags #define pv_uni_display Perl_pv_uni_display @@ -903,7 +908,9 @@ #define vivify_ref Perl_vivify_ref #define wait4pid Perl_wait4pid #define parse_unicode_opts Perl_parse_unicode_opts +#endif #define seed Perl_seed +#ifdef PERL_CORE #define get_hash_seed Perl_get_hash_seed #define report_evil_fh Perl_report_evil_fh #define report_uninit Perl_report_uninit @@ -1016,8 +1023,6 @@ #endif #endif #define sv_nosharing Perl_sv_nosharing -#define sv_nolocking Perl_sv_nolocking -#define sv_nounlocking Perl_sv_nounlocking #define nothreadhook Perl_nothreadhook #if defined(PERL_IN_DOOP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE @@ -1406,6 +1411,7 @@ #if defined(PERL_IN_UTF8_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define is_utf8_char_slow S_is_utf8_char_slow +#define is_utf8_common S_is_utf8_common #endif #endif #define sv_setsv_flags Perl_sv_setsv_flags @@ -1648,6 +1654,9 @@ #endif #ifndef SPRINTF_RETURNS_STRLEN #endif +#ifdef PERL_CORE +#define my_clearenv Perl_my_clearenv +#endif #define ck_anoncode Perl_ck_anoncode #define ck_bitop Perl_ck_bitop #define ck_concat Perl_ck_concat @@ -2149,7 +2158,6 @@ #endif #define dounwind(a) Perl_dounwind(aTHX_ a) #ifdef PERL_CORE -#define do_aexec(a,b,c) Perl_do_aexec(aTHX_ a,b,c) #define do_aexec5(a,b,c,d,e) Perl_do_aexec5(aTHX_ a,b,c,d,e) #endif #define do_binmode(a,b,c) Perl_do_binmode(aTHX_ a,b,c) @@ -2159,8 +2167,15 @@ #define do_close(a,b) Perl_do_close(aTHX_ a,b) #ifdef PERL_CORE #define do_eof(a) Perl_do_eof(aTHX_ a) +#endif +#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION +#ifdef PERL_CORE +#endif +#else +#ifdef PERL_CORE #define do_exec(a) Perl_do_exec(aTHX_ a) #endif +#endif #if defined(WIN32) || defined(__SYMBIAN32__) #define do_aspawn(a,b,c) Perl_do_aspawn(aTHX_ a,b,c) #define do_spawn(a) Perl_do_spawn(aTHX_ a) @@ -2248,7 +2263,6 @@ #define gv_fetchfile(a) Perl_gv_fetchfile(aTHX_ a) #define gv_fetchmeth(a,b,c,d) Perl_gv_fetchmeth(aTHX_ a,b,c,d) #define gv_fetchmeth_autoload(a,b,c,d) Perl_gv_fetchmeth_autoload(aTHX_ a,b,c,d) -#define gv_fetchmethod(a,b) Perl_gv_fetchmethod(aTHX_ a,b) #define gv_fetchmethod_autoload(a,b,c) Perl_gv_fetchmethod_autoload(aTHX_ a,b,c) #define gv_fetchpv(a,b,c) Perl_gv_fetchpv(aTHX_ a,b,c) #define gv_fullname(a,b) Perl_gv_fullname(aTHX_ a,b) @@ -2269,12 +2283,10 @@ #define hv_iterinit(a) Perl_hv_iterinit(aTHX_ a) #define hv_iterkey(a,b) Perl_hv_iterkey(aTHX_ a,b) #define hv_iterkeysv(a) Perl_hv_iterkeysv(aTHX_ a) -#define hv_iternext(a) Perl_hv_iternext(aTHX_ a) #define hv_iternextsv(a,b,c) Perl_hv_iternextsv(aTHX_ a,b,c) #define hv_iternext_flags(a,b) Perl_hv_iternext_flags(aTHX_ a,b) #define hv_iterval(a,b) Perl_hv_iterval(aTHX_ a,b) #define hv_ksplit(a,b) Perl_hv_ksplit(aTHX_ a,b) -#define hv_magic(a,b,c) Perl_hv_magic(aTHX_ a,b,c) #define hv_store(a,b,c,d,e) Perl_hv_store(aTHX_ a,b,c,d,e) #define hv_store_ent(a,b,c,d) Perl_hv_store_ent(aTHX_ a,b,c,d) #define hv_store_flags(a,b,c,d,e,f) Perl_hv_store_flags(aTHX_ a,b,c,d,e,f) @@ -2336,7 +2348,6 @@ #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_string_loclen(a,b,c,d) Perl_is_utf8_string_loclen(aTHX_ a,b,c,d) #define is_utf8_alnum(a) Perl_is_utf8_alnum(aTHX_ a) #define is_utf8_alnumc(a) Perl_is_utf8_alnumc(aTHX_ a) @@ -2875,10 +2886,15 @@ #define bytes_to_utf8(a,b) Perl_bytes_to_utf8(aTHX_ a,b) #define utf8_to_uvchr(a,b) Perl_utf8_to_uvchr(aTHX_ a,b) #define utf8_to_uvuni(a,b) Perl_utf8_to_uvuni(aTHX_ a,b) +#ifdef EBCDIC #define utf8n_to_uvchr(a,b,c,d) Perl_utf8n_to_uvchr(aTHX_ a,b,c,d) +#else +#endif #define utf8n_to_uvuni(a,b,c,d) Perl_utf8n_to_uvuni(aTHX_ a,b,c,d) +#ifdef EBCDIC #define uvchr_to_utf8(a,b) Perl_uvchr_to_utf8(aTHX_ a,b) -#define uvuni_to_utf8(a,b) Perl_uvuni_to_utf8(aTHX_ a,b) +#else +#endif #define uvchr_to_utf8_flags(a,b,c) Perl_uvchr_to_utf8_flags(aTHX_ a,b,c) #define uvuni_to_utf8_flags(a,b,c) Perl_uvuni_to_utf8_flags(aTHX_ a,b,c) #define pv_uni_display(a,b,c,d,e) Perl_pv_uni_display(aTHX_ a,b,c,d,e) @@ -2888,7 +2904,9 @@ #define vivify_ref(a,b) Perl_vivify_ref(aTHX_ a,b) #define wait4pid(a,b,c) Perl_wait4pid(aTHX_ a,b,c) #define parse_unicode_opts(a) Perl_parse_unicode_opts(aTHX_ a) +#endif #define seed() Perl_seed(aTHX) +#ifdef PERL_CORE #define get_hash_seed() Perl_get_hash_seed(aTHX) #define report_evil_fh(a,b,c) Perl_report_evil_fh(aTHX_ a,b,c) #define report_uninit(a) Perl_report_uninit(aTHX_ a) @@ -2996,8 +3014,6 @@ #endif #endif #define sv_nosharing(a) Perl_sv_nosharing(aTHX_ a) -#define sv_nolocking(a) Perl_sv_nolocking(aTHX_ a) -#define sv_nounlocking(a) Perl_sv_nounlocking(aTHX_ a) #define nothreadhook() Perl_nothreadhook(aTHX) #if defined(PERL_IN_DOOP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE @@ -3345,7 +3361,7 @@ #endif # if defined(DEBUGGING) #ifdef PERL_CORE -#define tokereport(a,b) S_tokereport(aTHX_ a,b) +#define tokereport(a) S_tokereport(aTHX_ a) #endif # endif #ifdef PERL_CORE @@ -3387,6 +3403,7 @@ #if defined(PERL_IN_UTF8_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define is_utf8_char_slow(a,b) S_is_utf8_char_slow(aTHX_ a,b) +#define is_utf8_common(a,b,c) S_is_utf8_common(aTHX_ a,b,c) #endif #endif #define sv_setsv_flags(a,b,c) Perl_sv_setsv_flags(aTHX_ a,b,c) @@ -3629,6 +3646,9 @@ #endif #ifndef SPRINTF_RETURNS_STRLEN #endif +#ifdef PERL_CORE +#define my_clearenv() Perl_my_clearenv(aTHX) +#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)