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 45d8923..cae666c 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1473,7 +1473,9 @@ 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 *dir|bool addsubdirs|bool addoldvers|bool usesep|bool canrelocate|bool unshift
+s      |void   |incpush        |NN const char *const dir|STRLEN len \
+                               |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
@@ -1485,30 +1487,13 @@ s       |void   |nuke_stacks
 s      |int    |open_script    |NN const char *scriptname|bool dosearch \
                                |NN bool *suidscript|NN PerlIO **rsfpp
 s      |void   |usage          |NN const char *name
-#ifdef DOSUID
-#  ifdef IAMSUID
-so     |void   |validate_suid  |NN const char *validarg \
-                               |int fdscript \
-                               |bool suidscript|NN SV* linestr_sv \
-                               |NN PerlIO *rsfp
-#  else
-so     |void   |validate_suid  |NN const char *validarg \
-                               |NN const char *scriptname|int fdscript \
-                               |NN SV* linestr_sv \
-                               |NN PerlIO *rsfp
-#  endif
-#else
-#  ifndef SETUID_SCRIPTS_ARE_SECURE_NOW
+#ifndef SETUID_SCRIPTS_ARE_SECURE_NOW
 so     |void   |validate_suid  |NN PerlIO *rsfp
-#  endif
 #endif
 
-#  if defined(IAMSUID)
-s      |int    |fd_on_nosuid_fs|int fd
-#  endif
 s      |void*  |parse_body     |NULLOK char **env|XSINIT_t xsinit
 rs     |void   |run_body       |I32 oldscope
-s      |SV *   |incpush_if_exists|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)