Cleanup shadow declarations

Box.c:265:10: warning: declaration shadows a local variable [-Wshadow]
            int i = bbw->composite.num_children;
                ^
Box.c:166:15: note: previous declaration is here
    Cardinal  i;
              ^
1 warning generated.

Form.c:809:9: warning: declaration shadows a local variable [-Wshadow]
        Widget w = *childP;
               ^
Form.c:793:24: note: previous declaration is here
XawFormDoLayout(Widget w,
                       ^
1 warning generated.

Viewport.c:627:24: warning: declaration shadows a local variable [-Wshadow]
                    if (!needshoriz) CheckHoriz();
                                     ^
Viewport.c:605:14: note: expanded from macro 'CheckHoriz'
                    Widget bar = w->viewport.horiz_bar;                 \
                           ^
Viewport.c:620:14: note: previous declaration is here
                    Widget bar = w->viewport.vert_bar;
                           ^
1 warning generated.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/Box.c b/src/Box.c
index ccd52fd..43be5dc 100644
--- a/src/Box.c
+++ b/src/Box.c
@@ -262,9 +262,9 @@ DoLayout(BoxWidget bbw, Dimension width, Dimension height,
 	if (bbw->composite.num_children == num_mapped_children)
 	    XMapSubwindows( XtDisplay((Widget)bbw), XtWindow((Widget)bbw) );
 	else {
-	    int i = bbw->composite.num_children;
+	    int j = bbw->composite.num_children;
 	    Widget *childP = bbw->composite.children;
-	    for (; i > 0; childP++, i--)
+	    for (; j > 0; childP++, j--)
 		if (XtIsRealized(*childP) && XtIsManaged(*childP) &&
 		    (*childP)->core.mapped_when_managed)
 		    XtMapWidget(*childP);