Silence a 'shadowing' warning

[perl/modules/Scope-Upper.git] / Upper.xs

diff --git a/Upper.xs b/Upper.xs
index 702481594747b6e41c6753b5f9304e1fecae3cf7..c23b6c05ed0f0dc08dab476d966819a7b593552e 100644 (file)
--- a/Upper.xs
+++ b/Upper.xs
@@ -1010,7 +1010,7 @@ static void su_pop(pTHX_ void *ud) {
 
 #if SU_HAS_PERL(5, 19, 4)
   cx = cxstack + cxstack_ix;
-  if (CxTYPE(cx) == CXt_SUB)
+  if (CxTYPE(cx) == CXt_SUB || CxTYPE(cx) == CXt_FORMAT)
    save = PL_scopestack[cx->blk_oldscopesp - 1];
 #endif
 
@@ -1018,7 +1018,7 @@ static void su_pop(pTHX_ void *ud) {
   leave_scope(base);
 
 #if SU_HAS_PERL(5, 19, 4)
-  if (CxTYPE(cx) == CXt_SUB)
+  if (CxTYPE(cx) == CXt_SUB || CxTYPE(cx) == CXt_FORMAT)
    PL_scopestack[cx->blk_oldscopesp - 1] = save;
 #endif
  }
@@ -1220,12 +1220,12 @@ static void su_yield(pTHX_ void *ud_) {
 #if SU_HAS_PERL(5, 10, 0)
    if (cxix > 0) {
     PERL_CONTEXT *prev = cx - 1;
-    U8 type = CxTYPE(prev);
-    if ((type == CXt_GIVEN || type == CXt_WHEN)
+    U8       prev_type = CxTYPE(prev);
+    if ((prev_type == CXt_GIVEN || prev_type == CXt_WHEN)
         && (prev->blk_oldcop == cx->blk_oldcop)) {
      cxix--;
      cx = prev;
-     if (type == CXt_GIVEN)
+     if (prev_type == CXt_GIVEN)
       goto cxt_given;
      else
       goto cxt_when;
@@ -2221,7 +2221,7 @@ static I32 su_context_gimme(pTHX_ I32 cxix) {
 
 /* --- Global setup/teardown ----------------------------------------------- */
 
-static U32 su_initialized = 0;
+static VOL U32 su_initialized = 0;
 
 static void su_global_teardown(pTHX_ void *root) {
  if (!su_initialized)