From 71dd18f72889ef6998a1bd699630da583dcb775a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 19 Oct 2010 10:22:55 +1000 Subject: Rename CountBits to EvdevCountBits. Avoid name collision with the server. Signed-off-by: Peter Hutterer Reviewed-by: Benjamin Tissoires Reviewed-by: Chase Douglas --- src/evdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index 626bb43..3c5fa89 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -165,7 +165,7 @@ static int EvdevSwitchMode(ClientPtr client, DeviceIntPtr device, int mode) return Success; } -static size_t CountBits(unsigned long *array, size_t nlongs) +static size_t EvdevCountBits(unsigned long *array, size_t nlongs) { unsigned int i; size_t count = 0; @@ -1280,7 +1280,7 @@ EvdevAddAbsClass(DeviceIntPtr device) if (!TestBit(EV_ABS, pEvdev->bitmask)) return !Success; - num_axes = CountBits(pEvdev->abs_bitmask, NLONGS(ABS_MAX)); + num_axes = EvdevCountBits(pEvdev->abs_bitmask, NLONGS(ABS_MAX)); if (num_axes < 1) return !Success; @@ -1387,7 +1387,7 @@ EvdevAddRelClass(DeviceIntPtr device) if (!TestBit(EV_REL, pEvdev->bitmask)) return !Success; - num_axes = CountBits(pEvdev->rel_bitmask, NLONGS(REL_MAX)); + num_axes = EvdevCountBits(pEvdev->rel_bitmask, NLONGS(REL_MAX)); if (num_axes < 1) return !Success; -- cgit v1.2.3