summaryrefslogtreecommitdiff
path: root/src/Form.c
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2012-01-22 11:58:09 -0800
committerJeremy Huddleston <jeremyhu@apple.com>2012-01-22 12:01:18 -0800
commit702e4ff9f5fbfae4aecba09f8c735dc97bac1b59 (patch)
tree01f404606c1b02f79d3d156d039eac40abf84ec9 /src/Form.c
parentd31153b30abd26c3f65e19d126ce4a3542cf14c0 (diff)
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>
Diffstat (limited to 'src/Form.c')
-rw-r--r--src/Form.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Form.c b/src/Form.c
index 49fceb6..f078270 100644
--- a/src/Form.c
+++ b/src/Form.c
@@ -790,7 +790,7 @@ PreferredGeometry(Widget widget, XtWidgetGeometry *request, XtWidgetGeometry *re
*/
void
-XawFormDoLayout(Widget w,
+XawFormDoLayout(Widget _fw,
#if NeedWidePrototypes
int doit)
#else
@@ -798,11 +798,11 @@ XawFormDoLayout(Widget w,
#endif
{
Widget *childP;
- FormWidget fw = (FormWidget)w;
+ FormWidget fw = (FormWidget)_fw;
int num_children = fw->composite.num_children;
WidgetList children = fw->composite.children;
- if ( ((fw->form.no_refigure = !doit) == TRUE) || !XtIsRealized(w) )
+ if ( ((fw->form.no_refigure = !doit) == TRUE) || !XtIsRealized(_fw) )
return;
for (childP = children; childP - children < num_children; childP++) {