kdrive: Fix -Wshadow errors
Just rename stuff to avoid conflicts. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
9c108b3ccd
commit
89c0fa3d6c
|
@ -1940,7 +1940,7 @@ _KdEnqueuePointerEvent(KdPointerInfo * pi, int type, int x, int y, int z,
|
|||
}
|
||||
|
||||
void
|
||||
KdBlockHandler(ScreenPtr pScreen, void *timeout, void *readmask)
|
||||
KdBlockHandler(ScreenPtr pScreen, void *timeo, void *readmask)
|
||||
{
|
||||
KdPointerInfo *pi;
|
||||
int myTimeout = 0;
|
||||
|
@ -1962,7 +1962,7 @@ KdBlockHandler(ScreenPtr pScreen, void *timeout, void *readmask)
|
|||
myTimeout = 20;
|
||||
}
|
||||
if (myTimeout > 0)
|
||||
AdjustWaitForDelay(timeout, myTimeout);
|
||||
AdjustWaitForDelay(timeo, myTimeout);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -1821,14 +1821,14 @@ KdXVCopyPlanarData(KdScreenInfo * screen, CARD8 *src, CARD8 *dst, int randr,
|
|||
|
||||
w >>= 1;
|
||||
for (j = 0; j < h; j++) {
|
||||
CARD32 *dst = (CARD32 *) dst1;
|
||||
CARD32 *dst32 = (CARD32 *) dst1;
|
||||
CARD8 *s1l = src1;
|
||||
CARD8 *s1r = src1 + srcNext;
|
||||
CARD8 *s2 = src2;
|
||||
CARD8 *s3 = src3;
|
||||
|
||||
for (i = 0; i < w; i++) {
|
||||
*dst++ = *s1l | (*s1r << 16) | (*s3 << 8) | (*s2 << 24);
|
||||
*dst32++ = *s1l | (*s1r << 16) | (*s3 << 8) | (*s2 << 24);
|
||||
s1l += srcRight;
|
||||
s1r += srcRight;
|
||||
s2 += srcRight2;
|
||||
|
|
Loading…
Reference in New Issue
Block a user