[PATCH joystick 2/2] Deal with opaque input option types.

Chase Douglas chase.douglas at canonical.com
Mon Oct 31 06:15:51 PDT 2011


On 10/31/2011 12:41 AM, Peter Hutterer wrote:
> ABI 14 made the InputOption type opaque, move the existing code to ifdefs
> and use the new function calls otherwise.
> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  src/jstk_key.c |   50 +++++++++++++++++++++++++++++++++++---------------
>  1 files changed, 35 insertions(+), 15 deletions(-)
> 
> diff --git a/src/jstk_key.c b/src/jstk_key.c
> index e842941..896bffc 100644
> --- a/src/jstk_key.c
> +++ b/src/jstk_key.c
> @@ -247,13 +247,43 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
>      return Success;
>  }
>  
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
> +static InputOption*
> +input-option_new(InputOption* list, const char *key, const char *value)

This function has an erroneous '-' in the name.

-- Chase


More information about the xorg-devel mailing list