diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-07-10 08:18:26 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-07-10 08:18:26 -0700 |
| commit | 8828fc21cb5b10f06294e460d15c38e234324960 (patch) | |
| tree | fabb47fcc336332217c1da3a38e9b08613e28d8e /src/Composite.c | |
| parent | 9dc5fb0b9640b79a234b58e640e05d8276556beb (diff) | |
Revert "Avoid shadowing variables."
This reverts commit 3919044bd7d3bcb85ce3425a43b8889a248a7542.
Breaks programs such as xcalc & xlogo on multiple platforms.
Diffstat (limited to 'src/Composite.c')
| -rw-r--r-- | src/Composite.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Composite.c b/src/Composite.c index ef77e53..29893d8 100644 --- a/src/Composite.c +++ b/src/Composite.c @@ -175,17 +175,17 @@ static void InheritAllowsChangeManagedSet( } static void CompositeClassPartInitialize( - WidgetClass cwidgetClass) + WidgetClass widgetClass) { register CompositePartPtr wcPtr; register CompositePartPtr superPtr = NULL; wcPtr = (CompositePartPtr) - &(((CompositeWidgetClass)cwidgetClass)->composite_class); + &(((CompositeWidgetClass)widgetClass)->composite_class); - if (cwidgetClass != compositeWidgetClass) + if (widgetClass != compositeWidgetClass) /* don't compute possible bogus pointer */ - superPtr = (CompositePartPtr)&(((CompositeWidgetClass)cwidgetClass + superPtr = (CompositePartPtr)&(((CompositeWidgetClass)widgetClass ->core_class.superclass)->composite_class); /* We don't need to check for null super since we'll get to composite @@ -200,7 +200,7 @@ static void CompositeClassPartInitialize( if (wcPtr->change_managed == XtInheritChangeManaged) { wcPtr->change_managed = superPtr->change_managed; - InheritAllowsChangeManagedSet(cwidgetClass); + InheritAllowsChangeManagedSet(widgetClass); } if (wcPtr->insert_child == XtInheritInsertChild) { |