diff options
| author | Rhys Kidd <rhyskidd@gmail.com> | 2019-01-20 21:31:19 -0500 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2019-01-20 21:44:50 -0500 |
| commit | 5233f3c84a436e01dabac531c2615e0e9af5f4ac (patch) | |
| tree | 42b53c646855c343cbcff35ed309995e10470213 | |
| parent | 22dd49f60be54c5649a9e80c87c9bfc99e2974b8 (diff) | |
| download | xorg-driver-xf86-video-nouveau-5233f3c84a436e01dabac531c2615e0e9af5f4ac.tar.gz | |
xv: Avoid shadowed declaration of 'int ret' in NVPutImage
Warning reported by gcc 8.2:
nouveau_xv.c: In function ‘NVPutImage’:
nouveau_xv.c:1369:7: warning: declaration of ‘ret’ shadows a previous local [-Wshadow]
int ret = BadImplementation;
^~~
nouveau_xv.c:1073:6: note: shadowed declaration is here
int ret, i;
^~~
Fixes: a50bba6 ("xv: misc cleanups")
Cc: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
| -rw-r--r-- | src/nouveau_xv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nouveau_xv.c b/src/nouveau_xv.c index e49b5ce..ddb5a99 100644 --- a/src/nouveau_xv.c +++ b/src/nouveau_xv.c @@ -1366,7 +1366,7 @@ CPU_copy: pPriv->currentBuffer ^= 1; } else if (action_flags & USE_TEXTURE) { - int ret = BadImplementation; + ret = BadImplementation; if (pNv->Architecture == NV_ARCH_30) { ret = NV30PutTextureImage(pScrn, pPriv->video_mem, |