From: Andy Lester <andy@petdance.com>
Date: Sat, 11 Mar 2006 01:13:38 +0000 (-0600)
Subject: Sync up embed.fnc and doio.c
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5b5cf8d2a2291946fc318cadec7c0c58e74bd1aa;p=p5sagit%2Fp5-mst-13.2.git

Sync up embed.fnc and doio.c
Message-ID: <20060311071338.GA12490@petdance.com>
Date: Sat, 11 Mar 2006 01:13:38 -0600

p4raw-id: //depot/perl@27470
---

diff --git a/embed.fnc b/embed.fnc
index 8a13284..ea1f33a 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -180,7 +180,7 @@ p	|OP*	|vdie		|NULLOK const char* pat|NULLOK va_list* args
 p	|OP*	|die_where	|NULLOK const char* message|STRLEN msglen
 Ap	|void	|dounwind	|I32 cxix
 pmb	|bool	|do_aexec	|NULLOK SV* really|NN SV** mark|NN SV** sp
-p	|bool	|do_aexec5	|NULLOK SV* really|NN SV** mark|NN SV** sp|int fd|int flag
+p	|bool	|do_aexec5	|NULLOK SV* really|NN SV** mark|NN SV** sp|int fd|int do_report
 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
@@ -198,7 +198,7 @@ Ap	|int	|do_spawn	|NN char* cmd
 Ap	|int	|do_spawn_nowait|NN char* cmd
 #endif
 #if !defined(WIN32)
-p	|bool	|do_exec3	|NN const char* cmd|int fd|int flag
+p	|bool	|do_exec3	|NN const char* cmd|int fd|int do_report
 #endif
 p	|void	|do_execfree
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
diff --git a/proto.h b/proto.h
index 16e549b..61f9571 100644
--- a/proto.h
+++ b/proto.h
@@ -389,7 +389,7 @@ PERL_CALLCONV void	Perl_dounwind(pTHX_ I32 cxix);
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3); */
 
-PERL_CALLCONV bool	Perl_do_aexec5(pTHX_ SV* really, SV** mark, SV** sp, int fd, int flag)
+PERL_CALLCONV bool	Perl_do_aexec5(pTHX_ SV* really, SV** mark, SV** sp, int fd, int do_report)
 			__attribute__nonnull__(pTHX_2)
 			__attribute__nonnull__(pTHX_3);
 
@@ -431,7 +431,7 @@ PERL_CALLCONV int	Perl_do_spawn_nowait(pTHX_ char* cmd)
 
 #endif
 #if !defined(WIN32)
-PERL_CALLCONV bool	Perl_do_exec3(pTHX_ const char* cmd, int fd, int flag)
+PERL_CALLCONV bool	Perl_do_exec3(pTHX_ const char* cmd, int fd, int do_report)
 			__attribute__nonnull__(pTHX_1);
 
 #endif