diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 1999-10-27 14:06:44 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 1999-10-27 14:06:44 +0000 |
| commit | 1ae6be1c7649fa55b3105031a58ffe146fa4f2fd (patch) | |
| tree | 2bdf0dec28a91f5b0e5b8445ed6c203c64e7268a /proto.h | |
| parent | 10a675193b1a7d3751e2d04a91c294c6be9dfaf7 (diff) | |
| parent | 2b260de0f3727bc62519897f69d6f752c97d8502 (diff) | |
| download | perl-1ae6be1c7649fa55b3105031a58ffe146fa4f2fd.tar.gz | |
Integrate with Sarathy; manual resolve on regcomp.c conflicts
(Ilya's changes won).
p4raw-id: //depot/cfgperl@4468
Diffstat (limited to 'proto.h')
| -rw-r--r-- | proto.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -83,7 +83,6 @@ VIRTUAL PPADDR_t* Perl_get_ppaddr(pTHX); VIRTUAL I32 Perl_cxinc(pTHX); VIRTUAL void Perl_deb(pTHX_ const char* pat, ...); VIRTUAL void Perl_vdeb(pTHX_ const char* pat, va_list* args); -VIRTUAL void Perl_deb_growlevel(pTHX); VIRTUAL void Perl_debprofdump(pTHX); VIRTUAL I32 Perl_debop(pTHX_ OP* o); VIRTUAL I32 Perl_debstack(pTHX); @@ -639,7 +638,7 @@ VIRTUAL void Perl_sv_vsetpvfn(pTHX_ SV* sv, const char* pat, STRLEN patlen, va_l VIRTUAL SV* Perl_swash_init(pTHX_ char* pkg, char* name, SV* listsv, I32 minbits, I32 none); VIRTUAL UV Perl_swash_fetch(pTHX_ SV *sv, U8 *ptr); VIRTUAL void Perl_taint_env(pTHX); -VIRTUAL void Perl_taint_proper(pTHX_ const char* f, char* s); +VIRTUAL void Perl_taint_proper(pTHX_ const char* f, const char* s); VIRTUAL UV Perl_to_utf8_lower(pTHX_ U8 *p); VIRTUAL UV Perl_to_utf8_upper(pTHX_ U8 *p); VIRTUAL UV Perl_to_utf8_title(pTHX_ U8 *p); @@ -992,7 +991,7 @@ STATIC I32 S_sublex_done(pTHX); STATIC I32 S_sublex_push(pTHX); STATIC I32 S_sublex_start(pTHX); STATIC char * S_filter_gets(pTHX_ SV *sv, PerlIO *fp, STRLEN append); -STATIC SV* S_new_constant(pTHX_ char *s, STRLEN len, char *key, SV *sv, SV *pv, char *type); +STATIC SV* S_new_constant(pTHX_ char *s, STRLEN len, const char *key, SV *sv, SV *pv, const char *type); STATIC int S_ao(pTHX_ int toketype); STATIC void S_depcom(pTHX); STATIC char* S_incl_perldb(pTHX); |