summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-02-15 15:30:59 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2012-02-15 15:30:59 -0800
commit42299b08106445e938e47392da5b3c26f650413a (patch)
tree2034ca5ae9d142a57300571a73cfe6513579dc41
parent5006597a1e440bde27b652bb1754f8ad8e4f39f8 (diff)
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 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--xev.c8
1 files 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);
}
}