diff options
Diffstat (limited to 'xorg-server/dix/getevents.c')
| -rw-r--r-- | xorg-server/dix/getevents.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index 8435d0411..36f792b1a 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -127,12 +127,12 @@ set_button_up(DeviceIntPtr pDev, int button, int type) Bool
button_is_down(DeviceIntPtr pDev, int button, int type)
{
- int ret = 0;
+ Bool ret = FALSE;
if (type & BUTTON_PROCESSED)
- ret |= BitIsOn(pDev->button->down, button);
+ ret = ret || BitIsOn(pDev->button->down, button);
if (type & BUTTON_POSTED)
- ret |= BitIsOn(pDev->button->postdown, button);
+ ret = ret || BitIsOn(pDev->button->postdown, button);
return ret;
}
@@ -158,12 +158,12 @@ set_key_up(DeviceIntPtr pDev, int key_code, int type) Bool
key_is_down(DeviceIntPtr pDev, int key_code, int type)
{
- int ret = 0;
+ Bool ret = FALSE;
if (type & KEY_PROCESSED)
- ret |= BitIsOn(pDev->key->down, key_code);
+ ret = ret || BitIsOn(pDev->key->down, key_code);
if (type & KEY_POSTED)
- ret |= BitIsOn(pDev->key->postdown, key_code);
+ ret = ret || BitIsOn(pDev->key->postdown, key_code);
return ret;
}
|