From: Nicholas Clark <nick@ccl4.org>
Date: Fri, 3 Feb 2006 18:10:45 +0000 (+0000)
Subject: Oops. I *thought* that I had checked that all changed files were open.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8dab44642a9d815deeb8bc2999f6bf1ee85a4992;p=p5sagit%2Fp5-mst-13.2.git

Oops. I *thought* that I had checked that all changed files were open.
Clearly not. (Fixes change 27066)

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

diff --git a/embed.h b/embed.h
index d6a0e9d..6eefaae 100644
--- a/embed.h
+++ b/embed.h
@@ -3202,7 +3202,7 @@
 #define nuke_stacks()		S_nuke_stacks(aTHX)
 #define open_script(a,b,c)	S_open_script(aTHX_ a,b,c)
 #define usage(a)		S_usage(aTHX_ a)
-#define validate_suid(a,b)	S_validate_suid(aTHX_ a,b)
+#define validate_suid(a,b,c)	S_validate_suid(aTHX_ a,b,c)
 #endif
 #  if defined(IAMSUID)
 #ifdef PERL_CORE
@@ -4160,7 +4160,7 @@
 
 #if !defined(PERL_CORE)
 #  define sv_setptrobj(rv,ptr,name)	sv_setref_iv(rv,name,PTR2IV(ptr))
-#  define sv_setptrref(rv,ptr)		sv_setref_iv(rv,Nullch,PTR2IV(ptr))
+#  define sv_setptrref(rv,ptr)		sv_setref_iv(rv,NULL,PTR2IV(ptr))
 #endif
 
 #if !defined(PERL_CORE) && !defined(PERL_NOCOMPAT)
diff --git a/embedvar.h b/embedvar.h
index 9b7fe7d..ecc46a0 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -246,7 +246,6 @@
 #define PL_exitlistlen		(vTHX->Iexitlistlen)
 #define PL_expect		(vTHX->Iexpect)
 #define PL_fdpid		(vTHX->Ifdpid)
-#define PL_fdscript		(vTHX->Ifdscript)
 #define PL_filemode		(vTHX->Ifilemode)
 #define PL_forkprocess		(vTHX->Iforkprocess)
 #define PL_formfeed		(vTHX->Iformfeed)
@@ -528,7 +527,6 @@
 #define PL_Iexitlistlen		PL_exitlistlen
 #define PL_Iexpect		PL_expect
 #define PL_Ifdpid		PL_fdpid
-#define PL_Ifdscript		PL_fdscript
 #define PL_Ifilemode		PL_filemode
 #define PL_Iforkprocess		PL_forkprocess
 #define PL_Iformfeed		PL_formfeed
diff --git a/perlapi.h b/perlapi.h
index 1fc4e08..17cbf69 100644
--- a/perlapi.h
+++ b/perlapi.h
@@ -290,8 +290,6 @@ END_EXTERN_C
 #define PL_expect		(*Perl_Iexpect_ptr(aTHX))
 #undef  PL_fdpid
 #define PL_fdpid		(*Perl_Ifdpid_ptr(aTHX))
-#undef  PL_fdscript
-#define PL_fdscript		(*Perl_Ifdscript_ptr(aTHX))
 #undef  PL_filemode
 #define PL_filemode		(*Perl_Ifilemode_ptr(aTHX))
 #undef  PL_forkprocess
diff --git a/proto.h b/proto.h
index 0e1e4fa..443303d 100644
--- a/proto.h
+++ b/proto.h
@@ -3185,14 +3185,14 @@ STATIC void	S_my_exit_jump(pTHX)
 			__attribute__noreturn__;
 
 STATIC void	S_nuke_stacks(pTHX);
-STATIC void	S_open_script(pTHX_ const char *scriptname, bool dosearch, SV *sv)
+STATIC int	S_open_script(pTHX_ const char *scriptname, bool dosearch, SV *sv)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_3);
 
 STATIC void	S_usage(pTHX_ const char *name)
 			__attribute__nonnull__(pTHX_1);
 
-STATIC void	S_validate_suid(pTHX_ const char *validarg, const char *scriptname)
+STATIC void	S_validate_suid(pTHX_ const char *validarg, const char *scriptname, int fdscript)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);