[PATCH 08/11] xfree86: replace True/False with TRUE/FALSE.
Peter Hutterer
peter.hutterer at who-t.net
Thu Jan 14 21:32:16 PST 2010
xf86Xinput.c relied on xkbsrv.h's definition of True/False which seems odd
at first and weird on second glance.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
hw/xfree86/common/xf86Xinput.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index df774a1..fb0ee9c 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/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;
}
/*
--
1.6.6
More information about the xorg-devel
mailing list