FW: [PATCH] RE: [PATCH] volatile, avoid clobbered

From: "Robin Barker" <Robin.Barker@npl.co.uk>
Message-ID: <46A0F33545E63740BC7563DE59CA9C6D093A06@exchsvr2.npl.ad.local>

p4raw-id: //depot/perl@33085

diff --git a/op.c b/op.c
index b3f765e..e82e29a 100644 (file)
--- a/op.c
+++ b/op.c
@@ -2341,7 +2341,7 @@ OP *
 Perl_fold_constants(pTHX_ register OP *o)
 {
     dVAR;
-    register OP *curop;
+    register OP * VOL curop;
     OP *newop;
     VOL I32 type = o->op_type;
     SV * VOL sv = NULL;

diff --git a/perl.c b/perl.c
index 8b045e0..02a889d 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -2560,7 +2560,7 @@ L<perlcall>.
 */
 
 I32
-Perl_call_sv(pTHX_ SV *sv, I32 flags)
+Perl_call_sv(pTHX_ SV *sv, VOL I32 flags)
                        /* See G_* flags in cop.h */
 {
     dVAR; dSP;

diff --git a/perl.h b/perl.h
index 9c86f86..8c5772f 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -524,11 +524,7 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
 #endif
 
 #if defined(HASVOLATILE) || defined(STANDARD_C)
-#   ifdef __cplusplus
-#      define VOL              /* to temporarily suppress warnings */
-#   else
 #      define VOL volatile
-#   endif
 #else
 #   define VOL
 #endif