[PATCH xf86-input-evdev 1/3] Remove support for X input ABI < 13

Peter Hutterer peter.hutterer at who-t.net
Sun Jan 23 20:09:38 PST 2011


On Sun, Jan 23, 2011 at 10:55:37PM -0500, Chase Douglas wrote:
> On 01/23/2011 10:42 PM, Peter Hutterer wrote:
> > On Sat, Jan 22, 2011 at 04:40:48PM -0500, Chase Douglas wrote:
> >> Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
> >> ---
> >>  src/draglock.c |    5 -
> >>  src/emuMB.c    |    4 -
> >>  src/emuWheel.c |    4 -
> >>  src/evdev.c    |  446 +-------------------------------------------------------
> >>  src/evdev.h    |   25 +---
> >>  5 files changed, 12 insertions(+), 472 deletions(-)
> >>
> >> diff --git a/src/evdev.h b/src/evdev.h
> >> index f640fdd..f590732 100644
> >> --- a/src/evdev.h
> >> +++ b/src/evdev.h
> >> @@ -39,6 +39,10 @@
> >>  #include <xf86_OSproc.h>
> >>  #include <xkbstr.h>
> >>  
> >> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 13
> >> +#error "Need X server input ABI version 13 or greater"
> >> +#endif
> >> +
> >>  #ifndef EV_CNT /* linux 2.6.23 kernels and earlier lack _CNT defines */
> >>  #define EV_CNT (EV_MAX+1)
> >>  #endif
> > 
> > shouldn't this be ABI < 12.2? 13 adds the MT APIs which aren't used in here
> > yet.
> 
> I wasn't sure what was going to happen with the abi numbers. I can
> respin this with 12.2 instead.

I'll fix it up locally, I do have the 12.2 patch in my tree for keith and
will send it with the next pull request.

Cheers,
  Peter


More information about the xorg-devel mailing list