From: Steve Hay <SteveHay@planit.com>
Date: Tue, 29 Jan 2008 15:06:55 +0000 (+0000)
Subject: Fix Win32 compiler warnings introduced by #33081 and #33085
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8c54174d094a78800e8ccba3f591a61aef9be2bf;p=p5sagit%2Fp5-mst-13.2.git

Fix Win32 compiler warnings introduced by #33081 and #33085

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

diff --git a/embed.fnc b/embed.fnc
index abf6cb9..fa5e1d5 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -646,7 +646,7 @@ Ap	|void	|call_atexit	|ATEXIT_t fn|NULLOK void *ptr
 Apd	|I32	|call_argv	|NN const char* sub_name|I32 flags|NN char** argv
 Apd	|I32	|call_method	|NN const char* methname|I32 flags
 Apd	|I32	|call_pv	|NN const char* sub_name|I32 flags
-Apd	|I32	|call_sv	|NN SV* sv|I32 flags
+Apd	|I32	|call_sv	|NN SV* sv|VOL I32 flags
 Ap	|void	|despatch_signals
 Ap	|OP *	|doref		|NN OP *o|I32 type|bool set_op_ref
 Apd	|SV*	|eval_pv	|NN const char* p|I32 croak_on_error
diff --git a/pod/perlapi.pod b/pod/perlapi.pod
index 28d7277..34de5fe 100644
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@ -428,7 +428,7 @@ L<perlcall>.
 
 NOTE: the perl_ form of this function is deprecated.
 
-	I32	call_sv(SV* sv, I32 flags)
+	I32	call_sv(SV* sv, VOL I32 flags)
 
 =for hackers
 Found in file perl.c
diff --git a/pp_ctl.c b/pp_ctl.c
index ff79349..86c5074 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -1838,6 +1838,8 @@ PP(pp_enteriter)
     U8 cxtype = CXt_LOOP_FOR;
 #ifdef USE_ITHREADS
     PAD *iterdata;
+#else
+    PADOFFSET op;
 #endif
 
     ENTER;
@@ -1875,7 +1877,8 @@ PP(pp_enteriter)
 #ifdef USE_ITHREADS
     PUSHLOOP_FOR(cx, iterdata, MARK, PL_op->op_targ);
 #else
-    PUSHLOOP_FOR(cx, svp, MARK, /*Not used*/);
+    PERL_UNUSED_VAR(op);
+    PUSHLOOP_FOR(cx, svp, MARK, op/*Not used*/);
 #endif
     if (PL_op->op_flags & OPf_STACKED) {
 	SV *maybe_ary = POPs;
diff --git a/proto.h b/proto.h
index 14a2e48..865823a 100644
--- a/proto.h
+++ b/proto.h
@@ -1763,7 +1763,7 @@ PERL_CALLCONV I32	Perl_call_method(pTHX_ const char* methname, I32 flags)
 PERL_CALLCONV I32	Perl_call_pv(pTHX_ const char* sub_name, I32 flags)
 			__attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV I32	Perl_call_sv(pTHX_ SV* sv, I32 flags)
+PERL_CALLCONV I32	Perl_call_sv(pTHX_ SV* sv, VOL I32 flags)
 			__attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV void	Perl_despatch_signals(pTHX);