Remove/rename shadowed vars

squirrel/sqclosure.h

@@ -101,7 +101,7 @@ struct SQOuter : public CHAINABLE_OBJ
     SQObjectPtr *_valptr;  /* pointer to value on stack, or _value below */
     SQInteger    _idx;     /* idx in stack array, for relocation */
     SQObjectPtr  _value;   /* value of outer after stack frame is closed */
-    SQOuter     *_next;    /* pointer to next outer when frame is open   */
+    SQOuter     *_next_outer;    /* pointer to next outer when frame is open   */
 };
 
 //////////////////////////////////////////////

squirrel/sqvm.cpp

@@ -1632,10 +1632,10 @@ void SQVM::FindOuter(SQObjectPtr &target, SQObjectPtr *stackindex)
             target = SQObjectPtr(p);
             return;
         }
-        pp = &p->_next;
+        pp = &p->_next_outer;
     }
     otr = SQOuter::Create(_ss(this), stackindex);
-    otr->_next = *pp;
+    otr->_next_outer = *pp;
     otr->_idx  = (stackindex - _stack._vals);
     __ObjAddRef(otr);
     *pp = otr;
@@ -1695,7 +1695,7 @@ void SQVM::RelocateOuters()
     SQOuter *p = _openouters;
     while (p) {
         p->_valptr = _stack._vals + p->_idx;
-        p = p->_next;
+        p = p->_next_outer;
     }
 }
 
@@ -1704,7 +1704,7 @@ void SQVM::CloseOuters(SQObjectPtr *stackindex) {
   while ((p = _openouters) != NULL && p->_valptr >= stackindex) {
     p->_value = *(p->_valptr);
     p->_valptr = &p->_value;
-    _openouters = p->_next;
+    _openouters = p->_next_outer;
     __ObjRelease(p);
   }
 }

squirrel/sqvm.h

@@ -168,7 +168,6 @@ typedef sqvector<CallInfo> CallInfoVec;
     CallInfo *ci;
     SQUserPointer _foreignptr;
     //VMs sharing the same state
-    SQSharedState *_sharedstate;
     SQInteger _nnativecalls;
     SQInteger _nmetamethodscall;
     SQRELEASEHOOK _releasehook;