From b5f04a79df8b5aab8b558461261d14721f0b3e41 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 8 Dec 2015 15:56:17 -0500 Subject: [PATCH] glxproxy: Silence shadowed-variable warnings Reviewed-by: Peter Hutterer Signed-off-by: Adam Jackson --- hw/dmx/glxProxy/glxsingle.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c index 79d426bbf..e254936a9 100644 --- a/hw/dmx/glxProxy/glxsingle.c +++ b/hw/dmx/glxProxy/glxsingle.c @@ -804,9 +804,8 @@ __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc) int win_y1, win_y2; int ebits, rowsize; - __GLX_DECLARE_SWAP_VARIABLES; - if (client->swapped) { + __GLX_DECLARE_SWAP_VARIABLES; __GLX_SWAP_INT(&req->contextTag); } @@ -834,6 +833,7 @@ __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc) lsbFirst = *(GLboolean *) (pc + 25); if (client->swapped) { + __GLX_DECLARE_SWAP_VARIABLES; __GLX_SWAP_INT(&x); __GLX_SWAP_INT(&y); __GLX_SWAP_INT(&width); @@ -1017,6 +1017,7 @@ __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc) }; if (client->swapped) { + __GLX_DECLARE_SWAP_VARIABLES; __GLX_SWAP_SHORT(&reply.sequenceNumber); __GLX_SWAP_INT(&reply.length); }