From: Trevor Woerner <[email protected]> The function, 'ReverseConvertProc()', is no longer needed with the new XINPUT ABI.
Signed-off-by: Trevor Woerner <[email protected]> --- src/acecad.c | 2 ++ src/acecad.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/acecad.c b/src/acecad.c index 6040b99..bdfe207 100644 --- a/src/acecad.c +++ b/src/acecad.c @@ -1072,6 +1072,7 @@ ConvertProc (InputInfoPtr local, int first, int num, } +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 static Bool ReverseConvertProc (InputInfoPtr local, int x, int y, @@ -1086,6 +1087,7 @@ ReverseConvertProc (InputInfoPtr local, return TRUE; } +#endif #define WriteString(str)\ diff --git a/src/acecad.h b/src/acecad.h index a2b5c66..6660892 100644 --- a/src/acecad.h +++ b/src/acecad.h @@ -102,7 +102,9 @@ static Bool DeviceClose (DeviceIntPtr); static Bool DeviceInit (DeviceIntPtr); static void ReadInput (InputInfoPtr); static Bool ConvertProc (InputInfoPtr, int, int, int, int, int, int, int, int, int *, int *); +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 static Bool ReverseConvertProc(InputInfoPtr , int , int , int*); +#endif static Bool QueryHardware (AceCadPrivatePtr); static void NewPacket (AceCadPrivatePtr priv); static Bool AceCadGetPacket (AceCadPrivatePtr); -- 1.7.4.rc2 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
