X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=proto.h;h=2050389066d47a749e7a166821c6cadfe9128e52;hb=17ad201a5d2de952269cf4eeb85881a49a9c3867;hp=a932e61e5e3892e9248f872c787a0067980da46b;hpb=cb2f1b7b22aef64f26e7bd5484244a0df0c94631;p=p5sagit%2Fp5-mst-13.2.git diff --git a/proto.h b/proto.h index a932e61..2050389 100644 --- a/proto.h +++ b/proto.h @@ -365,9 +365,9 @@ PERL_CALLCONV OP* Perl_die(pTHX_ const char* pat, ...) PERL_CALLCONV OP* Perl_vdie(pTHX_ const char* pat, va_list* args); PERL_CALLCONV OP* Perl_die_where(pTHX_ const char* message, STRLEN msglen); PERL_CALLCONV void Perl_dounwind(pTHX_ I32 cxix); -PERL_CALLCONV bool Perl_do_aexec(pTHX_ SV* really, SV** mark, SV** sp) +/* PERL_CALLCONV bool Perl_do_aexec(pTHX_ SV* really, SV** mark, SV** sp) __attribute__nonnull__(pTHX_2) - __attribute__nonnull__(pTHX_3); + __attribute__nonnull__(pTHX_3); */ PERL_CALLCONV bool Perl_do_aexec5(pTHX_ SV* really, SV** mark, SV** sp, int fd, int flag) __attribute__nonnull__(pTHX_2) @@ -386,9 +386,17 @@ PERL_CALLCONV bool Perl_do_close(pTHX_ GV* gv, bool not_implicit) PERL_CALLCONV bool Perl_do_eof(pTHX_ GV* gv) __attribute__nonnull__(pTHX_1); + +#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION +/* PERL_CALLCONV bool Perl_do_exec(pTHX_ const char* cmd) + __attribute__nonnull__(pTHX_1); */ + +#else PERL_CALLCONV bool Perl_do_exec(pTHX_ const char* cmd) __attribute__nonnull__(pTHX_1); +#endif + #if defined(WIN32) || defined(__SYMBIAN32__) PERL_CALLCONV int Perl_do_aspawn(pTHX_ SV* really, SV** mark, SV** sp) __attribute__nonnull__(pTHX_1) @@ -441,9 +449,9 @@ PERL_CALLCONV void Perl_do_join(pTHX_ SV* sv, SV* del, SV** mark, SV** sp) __attribute__nonnull__(pTHX_4); PERL_CALLCONV OP* Perl_do_kv(pTHX); -PERL_CALLCONV bool Perl_do_open(pTHX_ GV* gv, const char* name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO* supplied_fp) +/* PERL_CALLCONV bool Perl_do_open(pTHX_ GV* gv, const char* name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO* supplied_fp) __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); + __attribute__nonnull__(pTHX_2); */ PERL_CALLCONV bool Perl_do_open9(pTHX_ GV *gv, const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV *svs, I32 num) __attribute__nonnull__(pTHX_1) @@ -591,8 +599,8 @@ PERL_CALLCONV GV* Perl_gv_fetchmeth(pTHX_ HV* stash, const char* name, STRLEN le PERL_CALLCONV GV* Perl_gv_fetchmeth_autoload(pTHX_ HV* stash, const char* name, STRLEN len, I32 level) __attribute__nonnull__(pTHX_2); -PERL_CALLCONV GV* Perl_gv_fetchmethod(pTHX_ HV* stash, const char* name) - __attribute__nonnull__(pTHX_2); +/* PERL_CALLCONV GV* Perl_gv_fetchmethod(pTHX_ HV* stash, const char* name) + __attribute__nonnull__(pTHX_2); */ PERL_CALLCONV GV* Perl_gv_fetchmethod_autoload(pTHX_ HV* stash, const char* name, I32 autoload) __attribute__nonnull__(pTHX_2); @@ -662,9 +670,9 @@ PERL_CALLCONV SV* Perl_hv_iterkeysv(pTHX_ HE* entry) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); -PERL_CALLCONV HE* Perl_hv_iternext(pTHX_ HV* tb) +/* PERL_CALLCONV HE* Perl_hv_iternext(pTHX_ HV* tb) __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1); + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV SV* Perl_hv_iternextsv(pTHX_ HV* hv, char** key, I32* retlen) __attribute__warn_unused_result__ @@ -684,8 +692,8 @@ PERL_CALLCONV SV* Perl_hv_iterval(pTHX_ HV* tb, HE* entry) PERL_CALLCONV void Perl_hv_ksplit(pTHX_ HV* hv, IV newmax) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV void Perl_hv_magic(pTHX_ HV* hv, GV* gv, int how) - __attribute__nonnull__(pTHX_1); +/* PERL_CALLCONV void Perl_hv_magic(pTHX_ HV* hv, GV* gv, int how) + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV SV** Perl_hv_store(pTHX_ HV* tb, const char* key, I32 klen, SV* val, U32 hash); PERL_CALLCONV HE* Perl_hv_store_ent(pTHX_ HV* tb, SV* key, SV* val, U32 hash); @@ -883,8 +891,8 @@ PERL_CALLCONV STRLEN Perl_is_utf8_char(pTHX_ const U8 *p) PERL_CALLCONV bool Perl_is_utf8_string(pTHX_ const U8 *s, STRLEN len) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV bool Perl_is_utf8_string_loc(pTHX_ const U8 *s, STRLEN len, const U8 **p) - __attribute__nonnull__(pTHX_1); +/* PERL_CALLCONV bool Perl_is_utf8_string_loc(pTHX_ const U8 *s, STRLEN len, const U8 **p) + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV bool Perl_is_utf8_string_loclen(pTHX_ const U8 *s, STRLEN len, const U8 **ep, STRLEN *el) __attribute__nonnull__(pTHX_1); @@ -2388,17 +2396,33 @@ PERL_CALLCONV UV Perl_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen) PERL_CALLCONV UV Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen) __attribute__nonnull__(pTHX_1); + +#ifdef EBCDIC PERL_CALLCONV UV Perl_utf8n_to_uvchr(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) __attribute__nonnull__(pTHX_1); +#else +/* PERL_CALLCONV UV Perl_utf8n_to_uvchr(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) + __attribute__nonnull__(pTHX_1); */ + +#endif + PERL_CALLCONV UV Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) __attribute__nonnull__(pTHX_1); + +#ifdef EBCDIC PERL_CALLCONV U8* Perl_uvchr_to_utf8(pTHX_ U8 *d, UV uv) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV U8* Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv) - __attribute__nonnull__(pTHX_1); +#else +/* PERL_CALLCONV U8* Perl_uvchr_to_utf8(pTHX_ U8 *d, UV uv) + __attribute__nonnull__(pTHX_1); */ + +#endif + +/* PERL_CALLCONV U8* Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv) + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV U8* Perl_uvchr_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags) __attribute__nonnull__(pTHX_1); @@ -2507,12 +2531,12 @@ PERL_CALLCONV void Perl_sv_catpv_mg(pTHX_ SV *sv, const char *ptr) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); -PERL_CALLCONV void Perl_sv_catpvn_mg(pTHX_ SV *sv, const char *ptr, STRLEN len) +/* PERL_CALLCONV void Perl_sv_catpvn_mg(pTHX_ SV *sv, const char *ptr, STRLEN len) __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_2); + __attribute__nonnull__(pTHX_2); */ -PERL_CALLCONV void Perl_sv_catsv_mg(pTHX_ SV *dstr, SV *sstr) - __attribute__nonnull__(pTHX_1); +/* PERL_CALLCONV void Perl_sv_catsv_mg(pTHX_ SV *dstr, SV *sstr) + __attribute__nonnull__(pTHX_1); */ PERL_CALLCONV void Perl_sv_setpvf_mg(pTHX_ SV *sv, const char* pat, ...) __attribute__format__(__printf__,pTHX_2,pTHX_3) @@ -2766,8 +2790,8 @@ PERL_CALLCONV int Perl_sv_release_IVX(pTHX_ SV *sv) #endif PERL_CALLCONV void Perl_sv_nosharing(pTHX_ SV *); -PERL_CALLCONV void Perl_sv_nolocking(pTHX_ SV *); -PERL_CALLCONV void Perl_sv_nounlocking(pTHX_ SV *); +/* PERL_CALLCONV void Perl_sv_nolocking(pTHX_ SV *); */ +/* PERL_CALLCONV void Perl_sv_nounlocking(pTHX_ SV *); */ PERL_CALLCONV int Perl_nothreadhook(pTHX); END_EXTERN_C @@ -3697,9 +3721,7 @@ STATIC SV* S_new_constant(pTHX_ const char *s, STRLEN len, const char *key, SV * __attribute__nonnull__(pTHX_4); # if defined(DEBUGGING) -STATIC int S_tokereport(pTHX_ const char *s, I32 rv) - __attribute__nonnull__(pTHX_1); - +STATIC int S_tokereport(pTHX_ I32 rv); # endif STATIC int S_ao(pTHX_ int toketype); STATIC void S_depcom(pTHX);