diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
| commit | a6bdd56c5b098599942e4091ae7e2af2d4631b44 (patch) | |
| tree | e0a23167aca0fb1127f4cd78edf458b633b31eac /src/Composite.c | |
| parent | 6a13c9e08bb042c81ae904c44a38a50d785c824e (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/Composite.c')
| -rw-r--r-- | src/Composite.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/Composite.c b/src/Composite.c index 6d3ea64..c3612cc 100644 --- a/src/Composite.c +++ b/src/Composite.c @@ -58,6 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Composite.c,v 1.6 2001/12/14 19:56:08 dawes Exp $ */ #define COMPOSITE #include "IntrinsicI.h" @@ -167,7 +168,7 @@ static void CompositeClassPartInitialize(widgetClass) WidgetClass widgetClass; { register CompositePartPtr wcPtr; - register CompositePartPtr superPtr; + register CompositePartPtr superPtr = NULL; wcPtr = (CompositePartPtr) &(((CompositeWidgetClass)widgetClass)->composite_class); @@ -176,10 +177,6 @@ static void CompositeClassPartInitialize(widgetClass) /* don't compute possible bogus pointer */ superPtr = (CompositePartPtr)&(((CompositeWidgetClass)widgetClass ->core_class.superclass)->composite_class); -#ifdef lint - else - superPtr = NULL; -#endif /* We don't need to check for null super since we'll get to composite eventually, and it had better define them! */ |