diff options
| author | Nick Ing-Simmons <nik@tiuk.ti.com> | 1999-10-16 09:35:20 +0000 |
|---|---|---|
| committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 1999-10-16 09:35:20 +0000 |
| commit | e6d78dcc789dccb982e1607cb4aa1ffdbeb189b0 (patch) | |
| tree | 65b49fca5ff039472a57d85c4bc68b5eb4dd3a35 /proto.h | |
| parent | 33d8f7c1afe01d04914301ea81b4771b23fc2612 (diff) | |
| parent | 0eb4ebd7b699fc429e8edad9358a70c2ea08eaaf (diff) | |
| download | perl-e6d78dcc789dccb982e1607cb4aa1ffdbeb189b0.tar.gz | |
Resolve utfperl branch against mainline as of _62
p4raw-id: //depot/utfperl@4394
Diffstat (limited to 'proto.h')
| -rw-r--r-- | proto.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -510,7 +510,8 @@ VIRTUAL void Perl_save_aptr(pTHX_ AV** aptr); VIRTUAL AV* Perl_save_ary(pTHX_ GV* gv); VIRTUAL void Perl_save_clearsv(pTHX_ SV** svp); VIRTUAL void Perl_save_delete(pTHX_ HV* hv, char* key, I32 klen); -VIRTUAL void Perl_save_destructor(pTHX_ DESTRUCTORFUNC_t f, void* p); +VIRTUAL void Perl_save_destructor(pTHX_ DESTRUCTORFUNC_NOCONTEXT_t f, void* p); +VIRTUAL void Perl_save_destructor_x(pTHX_ DESTRUCTORFUNC_t f, void* p); VIRTUAL void Perl_save_freesv(pTHX_ SV* sv); VIRTUAL void Perl_save_freeop(pTHX_ OP* o); VIRTUAL void Perl_save_freepv(pTHX_ char* pv); @@ -729,8 +730,8 @@ VIRTUAL void Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, OP *o); VIRTUAL void Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, PMOP *pm); VIRTUAL void Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim); VIRTUAL void Perl_magic_dump(pTHX_ MAGIC *mg); -VIRTUAL void* Perl_default_protect(pTHX_ int *excpt, protect_body_t body, ...); -VIRTUAL void* Perl_vdefault_protect(pTHX_ int *excpt, protect_body_t body, va_list *args); +VIRTUAL void* Perl_default_protect(pTHX_ volatile JMPENV *je, int *excpt, protect_body_t body, ...); +VIRTUAL void* Perl_vdefault_protect(pTHX_ volatile JMPENV *je, int *excpt, protect_body_t body, va_list *args); VIRTUAL void Perl_reginitcolors(pTHX); VIRTUAL char* Perl_sv_2pv_nolen(pTHX_ SV* sv); VIRTUAL char* Perl_sv_2pvutf8_nolen(pTHX_ SV* sv); |