X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.fnc;h=9ff584af18dce14c6886d7d091d29fef0fb0524e;hb=2db5ca0a86d6b3a21023f595f7a9ea5a35b63ed3;hp=7363a46939183be1ab354b67b0344ec49a5a6543;hpb=3c6f43c54193b37c407848ec22fb7115757d2090;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/embed.fnc b/embed.fnc
index 7363a46..9ff584a 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -171,7 +171,7 @@ Ap	|char*	|delimcpy	|NN char* to|NN const char* toend|NN const char* from \
 				|NN const char* fromend|int delim|NN I32* retlen
 p	|void	|deprecate	|NN const char* s
 p	|void	|deprecate_old	|NN const char* s
-Afp	|OP*	|die		|NN const char* pat|...
+Afp	|OP*	|die		|NULLOK const char* pat|...
 p	|OP*	|vdie		|NULLOK const char* pat|NULLOK va_list* args
 p	|OP*	|die_where	|NN const char* message|STRLEN msglen
 Ap	|void	|dounwind	|I32 cxix
@@ -181,14 +181,14 @@ Ap	|int	|do_binmode	|NN PerlIO *fp|int iotype|int mode
 p	|void	|do_chop	|NN SV* asv|NN SV* sv
 Ap	|bool	|do_close	|NN GV* gv|bool not_implicit
 p	|bool	|do_eof		|NN GV* gv
-p	|bool	|do_exec	|NN char* cmd
+p	|bool	|do_exec	|NN const char* cmd
 #if defined(WIN32) || defined(SYMBIAN)
 Ap	|int	|do_aspawn	|NN SV* really|NN SV** mark|NN SV** sp
 Ap	|int	|do_spawn	|NN char* cmd
 Ap	|int	|do_spawn_nowait|NN char* cmd
 #endif
 #if !defined(WIN32)
-p	|bool	|do_exec3	|NN char* cmd|int fd|int flag
+p	|bool	|do_exec3	|NN const char* cmd|int fd|int flag
 #endif
 p	|void	|do_execfree
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
@@ -201,12 +201,12 @@ p	|I32	|do_shmio	|I32 optype|SV** mark|SV** sp
 #endif
 Ap	|void	|do_join	|NN SV* sv|NN SV* del|NN SV** mark|NN SV** sp
 p	|OP*	|do_kv
-Ap	|bool	|do_open	|NN GV* gv|NN char* name|I32 len|int as_raw \
+Ap	|bool	|do_open	|NN GV* gv|NN const char* name|I32 len|int as_raw \
 				|int rawmode|int rawperm|NULLOK PerlIO* supplied_fp
-Ap	|bool	|do_open9	|NN GV *gv|NN char *name|I32 len|int as_raw \
+Ap	|bool	|do_open9	|NN GV *gv|NN const char *name|I32 len|int as_raw \
 				|int rawmode|int rawperm|NULLOK PerlIO *supplied_fp \
 				|NN SV *svs|I32 num
-Ap	|bool	|do_openn	|NN GV *gv|NN char *name|I32 len|int as_raw \
+Ap	|bool	|do_openn	|NN GV *gv|NN const char *name|I32 len|int as_raw \
 				|int rawmode|int rawperm|NULLOK PerlIO *supplied_fp \
 				|NULLOK SV **svp|I32 num
 p	|void	|do_pipe	|NN SV* sv|NULLOK GV* rgv|NULLOK GV* wgv
@@ -239,7 +239,7 @@ ApdR	|char*	|fbm_instr	|NN unsigned char* big|NN unsigned char* bigend \
 				|NN SV* littlesv|U32 flags
 p	|char*	|find_script	|const char *scriptname|bool dosearch \
 				|const char **search_ext|I32 flags
-p	|OP*	|force_list	|NN OP* arg
+p	|OP*	|force_list	|NULLOK OP* arg
 p	|OP*	|fold_constants	|NN OP* arg
 Afpd	|char*	|form		|NN const char* pat|...
 Ap	|char*	|vform		|NN const char* pat|NULLOK va_list* args
@@ -271,18 +271,18 @@ Ap	|void	|gv_fullname	|NN SV* sv|NN const GV* gv
 Apmb	|void	|gv_fullname3	|NN SV* sv|NN const GV* gv|NULLOK const char* prefix
 Ap	|void	|gv_fullname4	|NN SV* sv|NN const GV* gv|NULLOK const char* prefix|bool keepmain
 Ap	|void	|gv_init	|NN GV* gv|HV* stash|NN const char* name|STRLEN len|int multi
-Apd	|HV*	|gv_stashpv	|const char* name|I32 create
-Apd	|HV*	|gv_stashpvn	|const char* name|U32 namelen|I32 create
-Apd	|HV*	|gv_stashsv	|SV* sv|I32 create
-Apd	|void	|hv_clear	|HV* tb
-Ap	|void	|hv_delayfree_ent|HV* hv|HE* entry
-Apd	|SV*	|hv_delete	|HV* tb|const char* key|I32 klen|I32 flags
-Apd	|SV*	|hv_delete_ent	|HV* tb|SV* key|I32 flags|U32 hash
-ApdR	|bool	|hv_exists	|HV* tb|const char* key|I32 klen
-ApdR	|bool	|hv_exists_ent	|HV* tb|SV* key|U32 hash
-Apd	|SV**	|hv_fetch	|HV* tb|const char* key|I32 klen|I32 lval
-Apd	|HE*	|hv_fetch_ent	|HV* tb|SV* key|I32 lval|U32 hash
-Ap	|void	|hv_free_ent	|NN HV* hv|NULLOK HE* entry
+Apd	|HV*	|gv_stashpv	|NN const char* name|I32 create
+Apd	|HV*	|gv_stashpvn	|NN const char* name|U32 namelen|I32 create
+Apd	|HV*	|gv_stashsv	|NULLOK SV* sv|I32 create
+Apd	|void	|hv_clear	|NULLOK HV* tb
+Ap	|void	|hv_delayfree_ent|NN HV* hv|NULLOK HE* entry
+Apd	|SV*	|hv_delete	|NULLOK HV* tb|NN const char* key|I32 klen|I32 flags
+Apd	|SV*	|hv_delete_ent	|NULLOK HV* tb|NN SV* key|I32 flags|U32 hash
+ApdR	|bool	|hv_exists	|NULLOK HV* tb|NN const char* key|I32 klen
+ApdR	|bool	|hv_exists_ent	|NULLOK HV* tb|NN SV* key|U32 hash
+Apd	|SV**	|hv_fetch	|NULLOK HV* tb|NN const char* key|I32 klen|I32 lval
+Apd	|HE*	|hv_fetch_ent	|NULLOK HV* tb|NN SV* key|I32 lval|U32 hash
+Ap	|void	|hv_free_ent	|NN HV* hv|NULLOK HE* entryK
 Apd	|I32	|hv_iterinit	|NN HV* tb
 ApdR	|char*	|hv_iterkey	|NN HE* entry|NN I32* retlen
 ApdR	|SV*	|hv_iterkeysv	|NN HE* entry
@@ -297,7 +297,7 @@ Apd	|SV**	|hv_store	|HV* tb|const char* key|I32 klen|SV* val \
 Apd	|HE*	|hv_store_ent	|HV* tb|SV* key|SV* val|U32 hash
 ApM	|SV**	|hv_store_flags	|HV* tb|const char* key|I32 klen|SV* val \
 				|U32 hash|int flags
-Apd	|void	|hv_undef	|HV* tb
+Apd	|void	|hv_undef	|NULLOK HV* tb
 ApP	|I32	|ibcmp		|NN const char* a|NN const char* b|I32 len
 ApP	|I32	|ibcmp_locale	|NN const char* a|NN const char* b|I32 len
 Apd	|I32	|ibcmp_utf8	|NN const char* a|char **pe1|UV l1|bool u1|NN const char* b|char **pe2|UV l2|bool u2
@@ -309,7 +309,7 @@ Ap	|void	|init_tm	|struct tm *ptm
 pd	|U32	|intro_my
 ApPR	|char*	|instr		|NN const char* big|NN const char* little
 pR	|bool	|io_close	|NN IO* io|bool not_implicit
-pR	|OP*	|invert		|OP* cmd
+pR	|OP*	|invert		|NULLOK OP* cmd
 dpR	|bool	|is_gv_magical	|NN const char *name|STRLEN len|U32 flags
 ApR	|I32	|is_lvalue_sub
 ApPR	|U32	|to_uni_upper_lc|U32 c
@@ -440,13 +440,13 @@ p	|int	|magic_wipepack	|SV* sv|MAGIC* mg
 p	|void	|magicname	|const char* sym|const char* name|I32 namlen
 Ap	|void	|markstack_grow
 #if defined(USE_LOCALE_COLLATE)
-p	|int	|magic_setcollxfrm|SV* sv|MAGIC* mg
-p	|char*	|mem_collxfrm	|const char* s|STRLEN len|STRLEN* xlen
+p	|int	|magic_setcollxfrm|NN SV* sv|NN MAGIC* mg
+p	|char*	|mem_collxfrm	|NN const char* s|STRLEN len|NN STRLEN* xlen
 #endif
 Afp	|SV*	|mess		|NN const char* pat|...
 Ap	|SV*	|vmess		|NN const char* pat|NULLOK va_list* args
-p	|void	|qerror		|SV* err
-Apd     |void   |sortsv         |SV ** array|size_t num_elts|SVCOMPARE_t cmp
+p	|void	|qerror		|NN SV* err
+Apd	|void	|sortsv		|NN SV** array|size_t num_elts|SVCOMPARE_t cmp
 Apd	|int	|mg_clear	|NN SV* sv
 Apd	|int	|mg_copy	|NN SV* sv|NN SV* nsv|const char* key|I32 klen
 pd	|void	|mg_localize	|NN SV* sv|NN SV* nsv
@@ -483,7 +483,7 @@ AnpP	|I32	|my_memcmp	|NN const char* s1|NN const char* s2|I32 len
 Anp	|void*	|my_memset	|NN char* loc|I32 ch|I32 len
 #endif
 Ap	|I32	|my_pclose	|PerlIO* ptr
-Ap	|PerlIO*|my_popen	|char* cmd|char* mode
+Ap	|PerlIO*|my_popen	|const char* cmd|const char* mode
 Ap	|PerlIO*|my_popen_list	|char* mode|int n|SV ** args
 Ap	|void	|my_setenv	|const char* nam|const char* val
 Ap	|I32	|my_stat
@@ -494,39 +494,39 @@ ApPa	|long	|my_htonl	|long l
 ApPa	|long	|my_ntohl	|long l
 #endif
 p	|void	|my_unexec
-Apa	|OP*	|newANONLIST	|OP* o
-Apa	|OP*	|newANONHASH	|OP* o
+Apa	|OP*	|newANONLIST	|NULLOK OP* o
+Apa	|OP*	|newANONHASH	|NULLOK OP* o
 Ap	|OP*	|newANONSUB	|I32 floor|OP* proto|OP* block
 Apa	|OP*	|newASSIGNOP	|I32 flags|NULLOK OP* left|I32 optype|NULLOK OP* right
 Apa	|OP*	|newCONDOP	|I32 flags|NN OP* first|NULLOK OP* trueop|NULLOK OP* falseop
 Apd	|CV*	|newCONSTSUB	|NULLOK HV* stash|NULLOK const char* name|NULLOK SV* sv
 Ap	|void	|newFORM	|I32 floor|NULLOK OP* o|NULLOK OP* block
-Apa	|OP*	|newFOROP	|I32 flags|char* label|line_t forline \
-				|OP* sclr|OP* expr|OP*block|OP*cont
-Apa	|OP*	|newLOGOP	|I32 optype|I32 flags|OP* left|OP* right
-Apa	|OP*	|newLOOPEX	|I32 type|OP* label
-Apa	|OP*	|newLOOPOP	|I32 flags|I32 debuggable|OP* expr|OP* block
+Apa	|OP*	|newFOROP	|I32 flags|NULLOK char* label|line_t forline \
+				|NULLOK OP* sv|NN OP* expr|NULLOK OP* block|NULLOK OP* cont
+Apa	|OP*	|newLOGOP	|I32 optype|I32 flags|NN OP* left|NN OP* right
+Apa	|OP*	|newLOOPEX	|I32 type|NN OP* label
+Apa	|OP*	|newLOOPOP	|I32 flags|I32 debuggable|NULLOK OP* expr|NULLOK OP* block
 Apa	|OP*	|newNULLLIST
 Apa	|OP*	|newOP		|I32 optype|I32 flags
 Ap	|void	|newPROG	|NN OP* o
-Apa	|OP*	|newRANGE	|I32 flags|OP* left|OP* right
-Apa	|OP*	|newSLICEOP	|I32 flags|OP* subscript|OP* listop
-Apa	|OP*	|newSTATEOP	|I32 flags|char* label|OP* o
+Apa	|OP*	|newRANGE	|I32 flags|NN OP* left|NN OP* right
+Apa	|OP*	|newSLICEOP	|I32 flags|NULLOK OP* subscript|NULLOK OP* listop
+Apa	|OP*	|newSTATEOP	|I32 flags|NULLOK char* label|NULLOK OP* o
 Ap	|CV*	|newSUB		|I32 floor|OP* o|OP* proto|OP* block
 Apd	|CV*	|newXS		|NN const char* name|NN XSUBADDR_t f|NN const char* filename
 Apda	|AV*	|newAV
 Apa	|OP*	|newAVREF	|NN OP* o
 Apa	|OP*	|newBINOP	|I32 type|I32 flags|OP* first|OP* last
-Apa	|OP*	|newCVREF	|I32 flags|OP* o
-Apa	|OP*	|newGVOP	|I32 type|I32 flags|GV* gv
-Apa	|GV*	|newGVgen	|const char* pack
-Apa	|OP*	|newGVREF	|I32 type|OP* o
+Apa	|OP*	|newCVREF	|I32 flags|NULLOK OP* o
+Apa	|OP*	|newGVOP	|I32 type|I32 flags|NN GV* gv
+Apa	|GV*	|newGVgen	|NN const char* pack
+Apa	|OP*	|newGVREF	|I32 type|NULLOK OP* o
 ApaR	|OP*	|newHVREF	|NN OP* o
 ApdaR	|HV*	|newHV
-ApaR	|HV*	|newHVhv	|HV* hv
+ApaR	|HV*	|newHVhv	|NULLOK HV* hv
 Apa	|IO*	|newIO
 Apa	|OP*	|newLISTOP	|I32 type|I32 flags|OP* first|OP* last
-Apa	|OP*	|newPADOP	|I32 type|I32 flags|SV* sv
+Apa	|OP*	|newPADOP	|I32 type|I32 flags|NULLOK SV* sv
 Apa	|OP*	|newPMOP	|I32 type|I32 flags
 Apa	|OP*	|newPVOP	|I32 type|I32 flags|char* pv
 Apa	|SV*	|newRV		|NN SV* pref
@@ -537,33 +537,34 @@ Apa	|OP*	|newSVOP	|I32 type|I32 flags|NN SV* sv
 Apda	|SV*	|newSViv	|IV i
 Apda	|SV*	|newSVuv	|UV u
 Apda	|SV*	|newSVnv	|NV n
-Apda	|SV*	|newSVpv	|const char* s|STRLEN len
-Apda	|SV*	|newSVpvn	|const char* s|STRLEN len
-Apda	|SV*	|newSVhek	|const HEK *hek
-Apda	|SV*	|newSVpvn_share	|const char* s|I32 len|U32 hash
+Apda	|SV*	|newSVpv	|NULLOK const char* s|STRLEN len
+Apda	|SV*	|newSVpvn	|NULLOK const char* s|STRLEN len
+Apda	|SV*	|newSVhek	|NULLOK const HEK *hek
+Apda	|SV*	|newSVpvn_share	|NULLOK const char* s|I32 len|U32 hash
 Afpda	|SV*	|newSVpvf	|NN const char* pat|...
 Apa	|SV*	|vnewSVpvf	|NN const char* pat|NULLOK va_list* args
 Apda	|SV*	|newSVrv	|NN SV* rv|NULLOK const char* classname
 Apda	|SV*	|newSVsv	|NULLOK SV* old
-Apa	|OP*	|newUNOP	|I32 type|I32 flags|OP* first
-Apa	|OP*	|newWHILEOP	|I32 flags|I32 debuggable|LOOP* loop \
-				|I32 whileline|OP* expr|OP* block|OP* cont \
+Apa	|OP*	|newUNOP	|I32 type|I32 flags|NULLOK OP* first
+Apa	|OP*	|newWHILEOP	|I32 flags|I32 debuggable|NULLOK LOOP* loop \
+				|I32 whileline|NULLOK OP* expr|NULLOK OP* block|NULLOK OP* cont \
 				|I32 has_my
 Apa	|PERL_SI*|new_stackinfo|I32 stitems|I32 cxitems
 Ap	|char*	|scan_vstring	|NN const char *vstr|NN SV *sv
 Apd	|const char*	|scan_version	|NN const char *vstr|NN SV *sv|bool qv
-Apd	|SV*	|new_version	|SV *ver
-Apd	|SV*	|upg_version	|SV *ver
-Apd	|SV*	|vnumify	|SV *vs
-Apd	|SV*	|vnormal	|SV *vs
-Apd	|SV*	|vstringify	|SV *vs
+Apd	|SV*	|new_version	|NN SV *ver
+Apd	|SV*	|upg_version	|NN SV *ver
+Apd	|bool	|vverify	|NN SV *vs
+Apd	|SV*	|vnumify	|NN SV *vs
+Apd	|SV*	|vnormal	|NN SV *vs
+Apd	|SV*	|vstringify	|NN SV *vs
 Apd	|int	|vcmp		|NN SV *lvs|NN SV *rvs
-p	|PerlIO*|nextargv	|GV* gv
-ApP	|char*	|ninstr		|const char* big|const char* bigend \
-				|const char* little|const char* lend
-pr	|OP*	|oopsCV		|OP* o
-Ap	|void	|op_free	|OP* arg
-p	|void	|package	|OP* o
+p	|PerlIO*|nextargv	|NN GV* gv
+ApP	|char*	|ninstr		|NN const char* big|NN const char* bigend \
+				|NN const char* little|NN const char* lend
+pr	|OP*	|oopsCV		|NN OP* o
+Ap	|void	|op_free	|NN OP* arg
+p	|void	|package	|NN OP* o
 pd	|PADOFFSET|pad_alloc	|I32 optype|U32 tmptype
 p	|PADOFFSET|allocmy	|NN char* name
 pdR	|PADOFFSET|pad_findmy	|NN const char* name
@@ -575,8 +576,8 @@ Apd	|SV*	|pad_sv		|PADOFFSET po
 pd	|void	|pad_free	|PADOFFSET po
 pd	|void	|pad_reset
 pd	|void	|pad_swipe	|PADOFFSET po|bool refadjust
-p	|void	|peep		|OP* o
-dopM	|PerlIO*|start_glob	|SV* pattern|IO *io
+p	|void	|peep		|NULLOK OP* o
+dopM	|PerlIO*|start_glob	|NN SV* pattern|NN IO *io
 #if defined(USE_REENTRANT_API)
 Ap	|void	|reentrant_size
 Ap	|void	|reentrant_init
@@ -604,33 +605,34 @@ Ap	|void	|set_numeric_local
 Ap	|void	|set_numeric_radix
 Ap	|void	|set_numeric_standard
 Apd	|void	|require_pv	|NN const char* pv
-Apd	|void	|pack_cat	|SV *cat|const char *pat|const char *patend|SV **beglist|SV **endlist|SV ***next_in_list|U32 flags
-Apd	|void	|packlist 	|SV *cat|const char *pat|const char *patend|SV **beglist|SV **endlist
+Apd	|void	|pack_cat	|NN SV *cat|NN const char *pat|NN const char *patend \
+				|NN SV **beglist|NN SV **endlist|NN SV ***next_in_list|U32 flags
+Apd	|void	|packlist 	|NN SV *cat|NN const char *pat|NN const char *patend|NN SV **beglist|NN SV **endlist
 p	|void	|pidgone	|Pid_t pid|int status
 Ap	|void	|pmflag		|NN U32* pmfl|int ch
 p	|OP*	|pmruntime	|NN OP* pm|NN OP* expr|bool isreg
-p	|OP*	|pmtrans	|NN OP* o|NN OP* expr|OP* repl
+p	|OP*	|pmtrans	|NN OP* o|NN OP* expr|NN OP* repl
 Ap	|void	|pop_scope
-p	|OP*	|prepend_elem	|I32 optype|OP* head|OP* tail
+p	|OP*	|prepend_elem	|I32 optype|NULLOK OP* head|NULLOK OP* tail
 Ap	|void	|push_scope
 p	|OP*	|ref		|NULLOK OP* o|I32 type
 p	|OP*	|refkids	|NULLOK OP* o|I32 type
 Ap	|void	|regdump	|NN regexp* r
-Ap	|SV*	|regclass_swash	|const struct regnode *n|bool doinit|SV **listsvp|SV **altsvp
+Ap	|SV*	|regclass_swash	|NN const struct regnode *n|bool doinit|NULLOK SV **listsvp|NULLOK SV **altsvp
 Ap	|I32	|pregexec	|NN regexp* prog|NN char* stringarg \
 				|NN char* strend|NN char* strbeg|I32 minend \
 				|NN SV* screamer|U32 nosave
 Ap	|void	|pregfree	|NULLOK struct regexp* r
 Ap	|regexp*|pregcomp	|NN char* exp|NN char* xend|NN PMOP* pm
-Ap	|char*	|re_intuit_start|regexp* prog|SV* sv|char* strpos \
-				|char* strend|U32 flags \
-				|struct re_scream_pos_data_s *data
-Ap	|SV*	|re_intuit_string|regexp* prog
+Ap	|char*	|re_intuit_start|NN regexp* prog|NULLOK SV* sv|NN char* strpos \
+				|NN char* strend|U32 flags \
+				|NULLOK struct re_scream_pos_data_s *data
+Ap	|SV*	|re_intuit_string|NN regexp* prog
 Ap	|I32	|regexec_flags	|NN regexp* prog|NN char* stringarg \
 				|NN char* strend|NN char* strbeg|I32 minend \
 				|SV* screamer|void* data|U32 flags
 ApR	|regnode*|regnext	|NN regnode* p
-Ep	|void	|regprop	|SV* sv|const regnode* o
+Ep	|void	|regprop	|NN SV* sv|NN const regnode* o
 Ap	|void	|repeatcpy	|NN char* to|NN const char* from|I32 len|I32 count
 ApP	|char*	|rninstr	|NN const char* big|NN const char* bigend \
 				|NN const char* little|NN const char* lend
@@ -706,8 +708,13 @@ p	|I32	|setenv_getix	|const char* nam
 #endif
 p	|void	|setdefout	|NULLOK GV* gv
 Ap	|HEK*	|share_hek	|NN const char* str|I32 len|U32 hash
+#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
+np	|Signal_t |sighandler	|int sig|...
+Anp	|Signal_t |csighandler	|int sig|...
+#else
 np	|Signal_t |sighandler	|int sig
 Anp	|Signal_t |csighandler	|int sig
+#endif
 Ap	|SV**	|stack_grow	|NN SV** sp|NN SV**p|int n
 ApR	|I32	|start_subparse	|I32 is_format|U32 flags
 p	|void	|sub_crush_depth|NN CV* cv
@@ -767,10 +774,10 @@ Apd	|int	|sv_isa		|NULLOK SV* sv|NN const char* name
 Apd	|int	|sv_isobject	|NULLOK SV* sv
 Apd	|STRLEN	|sv_len		|NULLOK SV* sv
 Apd	|STRLEN	|sv_len_utf8	|NULLOK SV* sv
-Apd	|void	|sv_magic	|NN SV* sv|NULLOK SV* obj|int how|const char* name \
+Apd	|void	|sv_magic	|NN SV* sv|NULLOK SV* obj|int how|NULLOK const char* name \
 				|I32 namlen
 Apd	|MAGIC *|sv_magicext	|NN SV* sv|NULLOK SV* obj|int how|const MGVTBL *vtbl \
-				|const char* name|I32 namlen
+				|NULLOK const char* name|I32 namlen
 ApdaR	|SV*	|sv_mortalcopy	|NULLOK SV* oldsv
 ApdR	|SV*	|sv_newmortal
 Apd	|SV*	|sv_newref	|NULLOK SV* sv
@@ -810,10 +817,10 @@ Apd	|void	|sv_untaint	|NN SV* sv
 Apd	|void	|sv_upgrade	|NN SV* sv|U32 mt
 Apd	|void	|sv_usepvn	|NN SV* sv|NULLOK char* ptr|STRLEN len
 Apd	|void	|sv_vcatpvfn	|NN SV* sv|NN const char* pat|STRLEN patlen \
-				|NULLOK va_list* args|SV** svargs|I32 svmax \
+				|NULLOK va_list* args|NULLOK SV** svargs|I32 svmax \
 				|NULLOK bool *maybe_tainted
 Apd	|void	|sv_vsetpvfn	|NN SV* sv|NN const char* pat|STRLEN patlen \
-				|NULLOK va_list* args|SV** svargs|I32 svmax \
+				|NULLOK va_list* args|NULLOK SV** svargs|I32 svmax \
 				|NULLOK bool *maybe_tainted
 ApR	|NV	|str_to_version	|NN SV *sv
 Ap	|SV*	|swash_init	|NN const char* pkg|NN const char* name|NN SV* listsv|I32 minbits|I32 none
@@ -827,7 +834,7 @@ Apd	|UV	|to_utf8_upper	|NN const U8 *p|NN U8* ustrp|NULLOK STRLEN *lenp
 Apd	|UV	|to_utf8_title	|NN const U8 *p|NN U8* ustrp|NULLOK STRLEN *lenp
 Apd	|UV	|to_utf8_fold	|NN const U8 *p|NN U8* ustrp|NULLOK STRLEN *lenp
 #if defined(UNLINK_ALL_VERSIONS)
-Ap	|I32	|unlnk		|NN char* f
+Ap	|I32	|unlnk		|NN const char* f
 #endif
 Apd	|I32	|unpack_str	|NN const char *pat|NN const char *patend|NN const char *s \
 				|NULLOK const char *strbeg|NN const char *strend|NULLOK char **new_s \
@@ -891,12 +898,12 @@ Ap	|void	|free_global_struct|struct perl_vars*
 Ap	|int	|runops_standard
 Ap	|int	|runops_debug
 Afpd	|void	|sv_catpvf_mg	|NN SV *sv|NN const char* pat|...
-Apd	|void	|sv_vcatpvf_mg	|NN SV* sv|NN const char* pat|va_list* args
+Apd	|void	|sv_vcatpvf_mg	|NN SV* sv|NN const char* pat|NULLOK va_list* args
 Apd	|void	|sv_catpv_mg	|NN SV *sv|NN const char *ptr
 Apd	|void	|sv_catpvn_mg	|NN SV *sv|NN const char *ptr|STRLEN len
 Apd	|void	|sv_catsv_mg	|NN SV *dstr|NULLOK SV *sstr
 Afpd	|void	|sv_setpvf_mg	|NN SV *sv|NN const char* pat|...
-Apd	|void	|sv_vsetpvf_mg	|NN SV* sv|NN const char* pat|va_list* args
+Apd	|void	|sv_vsetpvf_mg	|NN SV* sv|NN const char* pat|NULLOK va_list* args
 Apd	|void	|sv_setiv_mg	|NN SV *sv|IV i
 Apdb	|void	|sv_setpviv_mg	|NN SV *sv|IV iv
 Apd	|void	|sv_setuv_mg	|NN SV *sv|UV u
@@ -1308,6 +1315,7 @@ sR	|I32	|sublex_push
 sR	|I32	|sublex_start
 sR	|char *	|filter_gets	|NN SV *sv|NN PerlIO *fp|STRLEN append
 sR	|HV *	|find_in_my_stash|NN const char *pkgname|I32 len
+sR	|char *	|tokenize_use	|int|NN char*
 s	|SV*	|new_constant	|NULLOK const char *s|STRLEN len|NN const char *key|NN SV *sv \
 				|NULLOK SV *pv|NULLOK const char *type
 #  if defined(DEBUGGING)
@@ -1316,10 +1324,6 @@ s	|int	|tokereport	|NN const char *s|I32 rv
 s	|int	|ao		|int toketype
 s	|void	|depcom
 s	|const char*|incl_perldb
-#if 0
-s	|I32	|utf16_textfilter|int idx|SV *sv|int maxlen
-s	|I32	|utf16rev_textfilter|int idx|SV *sv|int maxlen
-#endif
 #  if defined(PERL_CR_FILTER)
 s	|I32	|cr_textfilter	|int idx|NULLOK SV *sv|int maxlen
 #  endif