On Sun, Feb 05, 2012 at 07:13:34PM +0100, Johannes Obermayr wrote:
> ---
>  src/sis_driver.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/src/sis_driver.c b/src/sis_driver.c
> index d733f48..a2924de 100644
> --- a/src/sis_driver.c
> +++ b/src/sis_driver.c
> @@ -85,8 +85,9 @@
>  #include <X11/extensions/dpms.h>
>  #endif
>  
> -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
>  #include <inputstr.h> /* for inputInfo */
> +extern InputInfo inputInfo;

is the extern line really needed here? afaict inputInfo has been in
inputstr.h for yonks.

Cheers,
  Peter

>  #endif
>  
>  
> @@ -9358,7 +9359,7 @@ SISMergedPointerMoved(int scrnIndex, int x, int y)
>              x = (int)dx;
>              y = (int)dy;
>          }
> -#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 11
> +#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13
>       miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
>  #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
>       miPointerSetPosition(inputInfo.pointer, x, y);
> -- 
> 1.7.7
> 
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to