diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-19 10:22:55 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-21 08:13:25 +1000 |
| commit | 71dd18f72889ef6998a1bd699630da583dcb775a (patch) | |
| tree | 4ed72f527c6bdeb1c09b3ec1f2a20eba47549931 | |
| parent | Use an array for the proximity bits. (diff) | |
| download | xf86-input-evdev-71dd18f72889ef6998a1bd699630da583dcb775a.tar.gz xf86-input-evdev-71dd18f72889ef6998a1bd699630da583dcb775a.tar.bz2 xf86-input-evdev-71dd18f72889ef6998a1bd699630da583dcb775a.zip | |
Rename CountBits to EvdevCountBits.
Avoid name collision with the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
| -rw-r--r-- | src/evdev.c | 6 |
1 files 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; |