[PATCH keyboard] Adjust to input ABI 12.

[Peter Hutterer]

On Wed, Nov 17, 2010 at 01:51:19PM -0500, Chase Douglas wrote:
> On 11/16/2010 07:11 PM, Peter Hutterer wrote:
> > New PreInit prototype and a few other things.
> > 
> > Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> > ---
> > Sorry, had this on my local tree and never pushed it, hence why I didn't
> > notice the build breaks.
> > 
> > Cheers,
> >   Peter
> > 
> >  src/kbd.c |   80 +++++++++++++++++++++++++++++++++++++++++++++----------------
> >  1 files changed, 59 insertions(+), 21 deletions(-)
> > 
> > diff --git a/src/kbd.c b/src/kbd.c
> > index e0b7003..62ce0c4 100644
> > --- a/src/kbd.c
> > +++ b/src/kbd.c
> > @@ -49,7 +49,11 @@
> >  /* Used to know when the first DEVICE_ON after a DEVICE_INIT is called */
> >  #define INITFLAG	(1U << 31)
> >  
> > +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
> >  static InputInfoPtr KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags);
> > +#else
> > +static int KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
> > +#endif
> >  static int KbdProc(DeviceIntPtr device, int what);
> >  static void KbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl);
> >  static void KbdBell(int percent, DeviceIntPtr dev, pointer ctrl, int unused);
> > @@ -125,21 +129,52 @@ SetXkbOption(InputInfoPtr pInfo, char *name, char **option)
> >      }
> >  }
> >  
> > +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
> > +static int
> > +NewKbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
> 
> Has this been test built against < 12? I think you're missing a
> semicolon here.

oops. I thought I had, but I must have only tested for ABI 12. Will do tests
for both and re-send. thanks for catching this.

Cheers,
  Peter