XLibre/xf86-input-evdev
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-evdev.git synced 2026-03-24 09:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move misplaced #endif caused by smooth-scrolling merge

Browse Source 
Bad conflict resolution in xf86-input-evdev-2.6.0-30-g745fca0

Reported-by: Sebastian Glita <glseba@yahoo.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2011-11-11 07:31:02 +10:00
parent dd000dd4fa
commit a9cdb6590c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/evdev.c
View File

@@ -1145,8 +1145,8 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
/* We don't post wheel events, so ignore them here too */
if (axis == REL_WHEEL || axis == REL_HWHEEL || axis == REL_DIAL)
continue;
if (!EvdevBitIsSet(pEvdev->rel_bitmask, axis))
#endif
if (!EvdevBitIsSet(pEvdev->rel_bitmask, axis))
continue;
pEvdev->axis_map[axis] = i;
i++;