summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-01-07 09:58:36 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-01-07 09:58:36 -0800
commitfb9c07cbf0339922816007f2d35c501266a439b1 (patch)
tree69849ae63e9031254e2e9b313e4cb50ef652196c
parent2fde7c02565384ce774c20face9755359c5d5946 (diff)
Make LED masks more consistently unsigned long to clear compiler/lint warnings
-rw-r--r--src/kbd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kbd.c b/src/kbd.c
index 3560a65..abaf5c8 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -56,7 +56,7 @@ extern int XkbDfltRepeatInterval;
#define MODEFLAG 8
#define COMPOSEFLAG 16
/* Used to know when the first DEVICE_ON after a DEVICE_INIT is called */
-#define INITFLAG (1 << 31)
+#define INITFLAG (1U << 31)
static InputInfoPtr KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags);
static int KbdProc(DeviceIntPtr device, int what);
@@ -395,7 +395,7 @@ static void
UpdateLeds(InputInfoPtr pInfo)
{
KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
- int leds = 0;
+ unsigned long leds = 0;
if (pKbd->keyLeds & CAPSFLAG) leds |= XLED1;
if (pKbd->keyLeds & NUMFLAG) leds |= XLED2;
@@ -410,7 +410,7 @@ UpdateLeds(InputInfoPtr pInfo)
static int
KbdCtrl( DeviceIntPtr device, KeybdCtrl *ctrl)
{
- int leds;
+ unsigned long leds;
InputInfoPtr pInfo = (InputInfoPtr) device->public.devicePrivate;
KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
@@ -515,7 +515,7 @@ InitKBD(InputInfoPtr pInfo, Bool init)
else rad |= ((58 / pKbd->rate) - 2);
pKbd->SetKbdRepeat(pInfo, rad);
} else {
- int leds = pKbd->keyLeds;
+ unsigned long leds = pKbd->keyLeds;
pKbd->keyLeds = pKbd->GetLeds(pInfo);
UpdateLeds(pInfo);