Merge branch 'blead' of ssh://perl5.git.perl.org/gitroot/perl into blead

[p5sagit/p5-mst-13.2.git] / embed.fnc

diff --git a/embed.fnc b/embed.fnc
index 5c76901..cae666c 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1473,13 +1473,13 @@ s       |void   |Slab_to_rw     |NN void *op
 #if defined(PERL_IN_PERL_C) || defined(PERL_DECL_PROT)
 s      |void   |find_beginning |NN SV* linestr_sv|NN PerlIO *rsfp
 s      |void   |forbid_setid   |const char flag|const bool suidscript
-s      |void   |incpush        |NULLOK const char *const dir|STRLEN len \
+s      |void   |incpush        |NN const char *const dir|STRLEN len \
                                |U32 flags
-s      |void   |incpush_use_sep|NULLOK const char *p|U32 flags
+s      |void   |incpush_use_sep|NN const char *p|STRLEN len|U32 flags
 s      |void   |init_interp
 s      |void   |init_ids
 s      |void   |init_main_stash
-s      |void   |init_perllib   |U32 old_vers
+s      |void   |init_perllib
 s      |void   |init_postdump_symbols|int argc|NN char **argv|NULLOK char **env
 s      |void   |init_predump_symbols
 rs     |void   |my_exit_jump
@@ -1493,7 +1493,7 @@ so        |void   |validate_suid  |NN PerlIO *rsfp
 
 s      |void*  |parse_body     |NULLOK char **env|XSINIT_t xsinit
 rs     |void   |run_body       |I32 oldscope
-s      |SV *   |incpush_if_exists|NN AV *const av|NN SV *dir
+s      |SV *   |incpush_if_exists|NN AV *const av|NN SV *dir|NN SV *const stem
 #endif
 
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)