[PATCH 5/5] glxproxy: Silence shadowed-variable warnings

[Peter Hutterer]

On Tue, Dec 08, 2015 at 04:05:55PM -0500, Adam Jackson wrote:
> Signed-off-by: Adam Jackson <ajax at redhat.com>

Series Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
   Peter
> ---
>  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 79d426b..e254936 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);
>      }
> -- 
> 2.5.0
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>