[PATCH xf86-input-keyboard 2/2] Finish XINPUT ABI cleanup.

Mark Kettenis mark.kettenis at xs4all.nl
Sun Oct 31 08:12:30 PDT 2010


> From: Trevor Woerner <twoerner at gmail.com>
> Date: Tue, 19 Oct 2010 12:38:23 -0400
> 
> From: Trevor Woerner <twoerner at gmail.com>
> 
> Provide an #ifdef so the driver can be built against
> and older XINPUT ABI.

Eh, wait a moment.  What exactly is this diff fixing?  Leaving out
initializations of trailing structure members to 0 is perfectly fine
in C, so the extra #ifdefs shouldn't be needed at all.

> Signed-off-by: Trevor Woerner <twoerner at gmail.com>
> ---
>  src/kbd.c |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/src/kbd.c b/src/kbd.c
> index 3aeffeb..e695c64 100644
> --- a/src/kbd.c
> +++ b/src/kbd.c
> @@ -71,6 +71,10 @@ _X_EXPORT InputDriverRec KBD = {
>  	KbdPreInit,
>  	NULL,
>  	NULL
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 11
> +	    ,
> +	0
> +#endif
>  };
>  
>  _X_EXPORT InputDriverRec KEYBOARD = {
> @@ -80,6 +84,10 @@ _X_EXPORT InputDriverRec KEYBOARD = {
>  	KbdPreInit,
>  	NULL,
>  	NULL
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 11
> +	    ,
> +	0
> +#endif
>  };
>  
>  static const char *kbdDefaults[] = {
> -- 
> 1.7.3.1.104.gc752e
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 


More information about the xorg-devel mailing list