For series:
Acked-by: Chris Bagwell <ch...@cnpbagwell.com>
On Tue, Mar 1, 2011 at 6:34 PM, Peter Hutterer <peter.hutte...@who-t.net> wrote:
> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
> ---
> test/fake-symbols.c | 10 ++++++++--
> test/fake-symbols.h | 9 ++++++++-
> 2 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/test/fake-symbols.c b/test/fake-symbols.c
> index b0af219..9d00d2d 100644
> --- a/test/fake-symbols.c
> +++ b/test/fake-symbols.c
> @@ -132,12 +132,13 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
> }
>
>
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION >= 11)
> _X_EXPORT void
> FreeInputAttributes(InputAttributes *attrs)
> {
> return;
> }
> -
> +#endif
>
> _X_EXPORT void
> xf86PostButtonEvent(DeviceIntPtr device,
> @@ -249,7 +250,10 @@ GetTimeInMillis (void)
>
>
> _X_EXPORT int
> -NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
> +NewInputDeviceRequest (InputOption *options,
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION >= 11)
> + InputAttributes *attrs,
> +#endif
> DeviceIntPtr *pdev)
> {
> return 0;
> @@ -269,11 +273,13 @@ miPointerGetScreen(DeviceIntPtr pDev)
> return NULL;
> }
>
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION >= 11)
> _X_EXPORT InputAttributes*
> DuplicateInputAttributes(InputAttributes *attrs)
> {
> return NULL;
> }
> +#endif
>
> _X_EXPORT int
> ValidAtom(Atom atom)
> diff --git a/test/fake-symbols.h b/test/fake-symbols.h
> index c713b5e..5593879 100644
> --- a/test/fake-symbols.h
> +++ b/test/fake-symbols.h
> @@ -36,7 +36,9 @@ xf86ScaleAxis(int Cx,
> int from_min );
>
> extern void DeleteInputDeviceRequest(DeviceIntPtr pDev);
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION >= 11)
> extern void FreeInputAttributes(InputAttributes *attrs);
> +#endif
> extern void
> xf86PostButtonEvent(DeviceIntPtr device,
> int is_absolute,
> @@ -85,14 +87,19 @@ XIChangeDeviceProperty (DeviceIntPtr dev, Atom property,
> Atom type,
> extern CARD32 GetTimeInMillis (void);
>
> extern int
> -NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
> +NewInputDeviceRequest (InputOption *options,
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION >= 11)
> + InputAttributes *attrs,
> +#endif
> DeviceIntPtr *pdev);
>
> extern Bool
> InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr
> controlProc);
>
> extern ScreenPtr miPointerGetScreen(DeviceIntPtr pDev);
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION >= 11)
> extern InputAttributes* DuplicateInputAttributes(InputAttributes *attrs);
> +#endif
> extern int ValidAtom(Atom atom);
> extern Bool
> InitKeyboardDeviceStruct(DeviceIntPtr dev, XkbRMLVOSet *rmlvo,
> --
> 1.7.4
>
>
> ------------------------------------------------------------------------------
> Free Software Download: Index, Search & Analyze Logs and other IT data in
> Real-Time with Splunk. Collect, index and harness all the fast moving IT data
> generated by your applications, servers and devices whether physical, virtual
> or in the cloud. Deliver compliance at lower cost and gain new business
> insights. http://p.sf.net/sfu/splunk-dev2dev
> _______________________________________________
> Linuxwacom-devel mailing list
> Linuxwacom-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
>
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
