diff options
| author | Keith Packard <keithp@keithp.com> | 2014-12-16 17:05:18 -0800 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-03-31 12:07:56 +1000 |
| commit | 7402eaa0185110a60cf4aae32d7b470c1372b45b (patch) | |
| tree | 99c59333fc607ac5e80b1ad6c4bc72702df41d57 /src/XrrProvider.c | |
| parent | bc00b4fb0b52ed2f6f8544fa3b5da9693ee7ed90 (diff) | |
| download | xorg-lib-libXrandr-7402eaa0185110a60cf4aae32d7b470c1372b45b.tar.gz | |
libXrandr: Clean up compiler warnings
This removes warnings about shadowing local variables with the same
name, and type mismatches with _XRead32.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/XrrProvider.c')
| -rw-r--r-- | src/XrrProvider.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/XrrProvider.c b/src/XrrProvider.c index 014ddd9..9e620c7 100644 --- a/src/XrrProvider.c +++ b/src/XrrProvider.c @@ -77,7 +77,7 @@ XRRGetProviderResources(Display *dpy, Window window) xrpr->nproviders = rep.nProviders; xrpr->providers = (RRProvider *)(xrpr + 1); - _XRead32(dpy, xrpr->providers, rep.nProviders << 2); + _XRead32(dpy, (long *) xrpr->providers, rep.nProviders << 2); if (nbytes > nbytesRead) _XEatData (dpy, (unsigned long) (nbytes - nbytesRead)); @@ -152,10 +152,10 @@ XRRGetProviderInfo(Display *dpy, XRRScreenResources *resources, RRProvider provi xpi->associated_capability = (unsigned int *)(xpi->associated_providers + rep.nAssociatedProviders); xpi->name = (char *)(xpi->associated_capability + rep.nAssociatedProviders); - _XRead32(dpy, xpi->crtcs, rep.nCrtcs << 2); - _XRead32(dpy, xpi->outputs, rep.nOutputs << 2); + _XRead32(dpy, (long *) xpi->crtcs, rep.nCrtcs << 2); + _XRead32(dpy, (long *) xpi->outputs, rep.nOutputs << 2); - _XRead32(dpy, xpi->associated_providers, rep.nAssociatedProviders << 2); + _XRead32(dpy, (long *) xpi->associated_providers, rep.nAssociatedProviders << 2); /* * _XRead32 reads a series of 32-bit values from the protocol and writes |