diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-25 08:22:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-25 08:22:27 +0000 |
| commit | 724396e50bc811ea09416afbe00a8420d60647bf (patch) | |
| tree | fd5f6baeaad8ae7cc680dae46e1ae633544ee2a9 /xorg-server/hw | |
| parent | 2ddb9669098ba260d0667276b5d1e7999c72b993 (diff) | |
| parent | a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a (diff) | |
| download | vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.tar.gz vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.tar.bz2 vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Xinput.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c index df774a155..fb0ee9c3f 100644 --- a/xorg-server/hw/xfree86/common/xf86Xinput.c +++ b/xorg-server/hw/xfree86/common/xf86Xinput.c @@ -504,10 +504,10 @@ InputClassMatches(XF86ConfInputClassPtr iclass, InputAttributes *attrs) { if (iclass->match_product && (!attrs->product || !strstr(attrs->product, iclass->match_product))) - return False; + return FALSE; if (iclass->match_vendor && (!attrs->vendor || !strstr(attrs->vendor, iclass->match_vendor))) - return False; + return FALSE; if (iclass->match_device && #ifdef HAVE_FNMATCH_H (!attrs->device || @@ -515,26 +515,26 @@ InputClassMatches(XF86ConfInputClassPtr iclass, InputAttributes *attrs) #else (!attrs->device || !strstr(attrs->device, iclass->match_device))) #endif - return False; + return FALSE; if (iclass->is_keyboard.set && iclass->is_keyboard.val != !!(attrs->flags & ATTR_KEYBOARD)) - return False; + return FALSE; if (iclass->is_pointer.set && iclass->is_pointer.val != !!(attrs->flags & ATTR_POINTER)) - return False; + return FALSE; if (iclass->is_joystick.set && iclass->is_joystick.val != !!(attrs->flags & ATTR_JOYSTICK)) - return False; + return FALSE; if (iclass->is_tablet.set && iclass->is_tablet.val != !!(attrs->flags & ATTR_TABLET)) - return False; + return FALSE; if (iclass->is_touchpad.set && iclass->is_touchpad.val != !!(attrs->flags & ATTR_TOUCHPAD)) - return False; + return FALSE; if (iclass->is_touchscreen.set && iclass->is_touchscreen.val != !!(attrs->flags & ATTR_TOUCHSCREEN)) - return False; - return True; + return FALSE; + return TRUE; } /* |