From 13a01fc1239bdafbd016be0b03e736fae1c33a9e Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 15 Feb 2012 15:30:59 -0800 Subject: Rename "mask" variable to "rr_mask" in randr setup code. Fixes gcc warning: xev.c: In function `main': xev.c:1129: warning: declaration of 'mask' shadows a previous local xev.c:923: warning: shadowed declaration is here Change-Id: Ic42076df5348e76139f6f013a76860f5566ed52e Signed-off-by: Alan Coopersmith --- xev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xev.c b/xev.c index 0a4cb01..9f9111a 100644 --- a/xev.c +++ b/xev.c @@ -1126,13 +1126,13 @@ main (int argc, char **argv) int rr_major, rr_minor; if (XRRQueryVersion (dpy, &rr_major, &rr_minor)) { - int mask = RRScreenChangeNotifyMask; + int rr_mask = RRScreenChangeNotifyMask; if (rr_major > 1 || (rr_major == 1 && rr_minor >= 2)) - mask |= RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | - RROutputPropertyNotifyMask; - XRRSelectInput (dpy, w, mask); + rr_mask |= RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | + RROutputPropertyNotifyMask; + XRRSelectInput (dpy, w, rr_mask); } } -- cgit v1.2.3