From: Vincent Pit <vince@profvince.com>
Date: Tue, 18 Jan 2011 12:33:16 +0000 (+0100)
Subject: Tighten the scope of two variables unused on 5.8
X-Git-Tag: rt64866~2
X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=14dd148fdcebf80aa4b583e590eb71b391f111c3;p=perl%2Fmodules%2FVariable-Magic.git

Tighten the scope of two variables unused on 5.8
---

diff --git a/Magic.xs b/Magic.xs
index 2de483f..0848686 100644
--- a/Magic.xs
+++ b/Magic.xs
@@ -772,7 +772,7 @@ STATIC void vmg_uvar_del(SV *sv, MAGIC *prevmagic, MAGIC *mg, MAGIC *moremagic)
 
 STATIC UV vmg_cast(pTHX_ SV *sv, const SV *wiz, SV **args, I32 items) {
 #define vmg_cast(S, W, A, I) vmg_cast(aTHX_ (S), (W), (A), (I))
- MAGIC       *mg, *moremagic = NULL;
+ MAGIC       *mg;
  SV          *data;
  const MGWIZ *w;
  U32          oldgmg;
@@ -814,7 +814,7 @@ STATIC UV vmg_cast(pTHX_ SV *sv, const SV *wiz, SV **args, I32 items) {
 
 #if VMG_UVAR
  if (w->uvar) {
-  MAGIC *prevmagic;
+  MAGIC *prevmagic, *moremagic = NULL;
   struct ufuncs uf[2];
 
   uf[0].uf_val   = vmg_svt_val;
@@ -867,7 +867,9 @@ STATIC UV vmg_dispell(pTHX_ SV *sv, const SV *wiz) {
  for (prevmagic = NULL, mg = SvMAGIC(sv); mg; prevmagic = mg, mg = moremagic) {
   moremagic = mg->mg_moremagic;
   if (mg->mg_type == PERL_MAGIC_ext && mg->mg_private == SIG_WIZ) {
+#if VMG_UVAR
    const MGWIZ *z   = vmg_wizard_mgwiz(mg->mg_ptr);
+#endif /* VMG_UVAR */
    IV           zid = vmg_wizard_id(mg->mg_ptr);
    if (zid == wid) {
 #if VMG_UVAR