summaryrefslogtreecommitdiff
path: root/embed.pl
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>1999-10-27 14:06:44 +0000
committerJarkko Hietaniemi <jhi@iki.fi>1999-10-27 14:06:44 +0000
commit1ae6be1c7649fa55b3105031a58ffe146fa4f2fd (patch)
tree2bdf0dec28a91f5b0e5b8445ed6c203c64e7268a /embed.pl
parent10a675193b1a7d3751e2d04a91c294c6be9dfaf7 (diff)
parent2b260de0f3727bc62519897f69d6f752c97d8502 (diff)
downloadperl-1ae6be1c7649fa55b3105031a58ffe146fa4f2fd.tar.gz
Integrate with Sarathy; manual resolve on regcomp.c conflicts
(Ilya's changes won). p4raw-id: //depot/cfgperl@4468
Diffstat (limited to 'embed.pl')
-rwxr-xr-xembed.pl7
1 files changed, 3 insertions, 4 deletions
diff --git a/embed.pl b/embed.pl
index d2b0bb2d3a..06d6371a1a 100755
--- a/embed.pl
+++ b/embed.pl
@@ -1078,7 +1078,6 @@ p |PPADDR_t*|get_ppaddr
p |I32 |cxinc
p |void |deb |const char* pat|...
p |void |vdeb |const char* pat|va_list* args
-p |void |deb_growlevel
p |void |debprofdump
p |I32 |debop |OP* o
p |I32 |debstack
@@ -1667,7 +1666,7 @@ p |SV* |swash_init |char* pkg|char* name|SV* listsv \
|I32 minbits|I32 none
p |UV |swash_fetch |SV *sv|U8 *ptr
p |void |taint_env
-p |void |taint_proper |const char* f|char* s
+p |void |taint_proper |const char* f|const char* s
p |UV |to_utf8_lower |U8 *p
p |UV |to_utf8_upper |U8 *p
p |UV |to_utf8_title |U8 *p
@@ -2051,8 +2050,8 @@ s |I32 |sublex_done
s |I32 |sublex_push
s |I32 |sublex_start
s |char * |filter_gets |SV *sv|PerlIO *fp|STRLEN append
-s |SV* |new_constant |char *s|STRLEN len|char *key|SV *sv \
- |SV *pv|char *type
+s |SV* |new_constant |char *s|STRLEN len|const char *key|SV *sv \
+ |SV *pv|const char *type
s |int |ao |int toketype
s |void |depcom
s |char* |incl_perldb