Move misplaced #endif caused by smooth-scrolling merge

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>
master
Peter Hutterer 15 years ago
parent dd000dd4fa
commit a9cdb6590c
  1. 2
      src/evdev.c

@ -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++;

Loading…
Cancel
Save