From 6850ea8fb95417db9ce3a70fc17f90d6fdea1389 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 15 Jan 2010 15:32:16 +1000 Subject: [PATCH] xfree86: replace True/False with TRUE/FALSE. 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 Reviewed-by: Dan Nicholson Signed-off-by: Keith Packard --- hw/xfree86/common/xf86Xinput.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index df774a155..fb0ee9c3f 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; } /*