andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: replace True/False with TRUE/FALSE.

Browse Source 
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@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Peter Hutterer 2010-01-15 15:32:16 +10:00 committed by Keith Packard
parent 64b1372c15
commit 6850ea8fb9
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xfree86/common/xf86Xinput.c
View File

@ -504,10 +504,10 @@ InputClassMatches(XF86ConfInputClassPtr iclass, InputAttributes *attrs)
{ {
if (iclass->match_product && if (iclass->match_product &&
(!attrs->product || !strstr(attrs->product, iclass->match_product))) (!attrs->product || !strstr(attrs->product, iclass->match_product)))
return False; return FALSE;
if (iclass->match_vendor && if (iclass->match_vendor &&
(!attrs->vendor || !strstr(attrs->vendor, iclass->match_vendor))) (!attrs->vendor || !strstr(attrs->vendor, iclass->match_vendor)))
return False; return FALSE;
if (iclass->match_device && if (iclass->match_device &&
#ifdef HAVE_FNMATCH_H #ifdef HAVE_FNMATCH_H
(!attrs->device || (!attrs->device ||
@ -515,26 +515,26 @@ InputClassMatches(XF86ConfInputClassPtr iclass, InputAttributes *attrs)
#else #else
(!attrs->device || !strstr(attrs->device, iclass->match_device))) (!attrs->device || !strstr(attrs->device, iclass->match_device)))
#endif #endif
return False; return FALSE;
if (iclass->is_keyboard.set && if (iclass->is_keyboard.set &&
iclass->is_keyboard.val != !!(attrs->flags & ATTR_KEYBOARD)) iclass->is_keyboard.val != !!(attrs->flags & ATTR_KEYBOARD))
return False; return FALSE;
if (iclass->is_pointer.set && if (iclass->is_pointer.set &&
iclass->is_pointer.val != !!(attrs->flags & ATTR_POINTER)) iclass->is_pointer.val != !!(attrs->flags & ATTR_POINTER))
return False; return FALSE;
if (iclass->is_joystick.set && if (iclass->is_joystick.set &&
iclass->is_joystick.val != !!(attrs->flags & ATTR_JOYSTICK)) iclass->is_joystick.val != !!(attrs->flags & ATTR_JOYSTICK))
return False; return FALSE;
if (iclass->is_tablet.set && if (iclass->is_tablet.set &&
iclass->is_tablet.val != !!(attrs->flags & ATTR_TABLET)) iclass->is_tablet.val != !!(attrs->flags & ATTR_TABLET))
return False; return FALSE;
if (iclass->is_touchpad.set && if (iclass->is_touchpad.set &&
iclass->is_touchpad.val != !!(attrs->flags & ATTR_TOUCHPAD)) iclass->is_touchpad.val != !!(attrs->flags & ATTR_TOUCHPAD))
return False; return FALSE;
if (iclass->is_touchscreen.set && if (iclass->is_touchscreen.set &&
iclass->is_touchscreen.val != !!(attrs->flags & ATTR_TOUCHSCREEN)) iclass->is_touchscreen.val != !!(attrs->flags & ATTR_TOUCHSCREEN))
return False; return FALSE;
return True; return TRUE;
} }
/* /*