On Thu, Oct 18, 2012 at 01:41:57PM -0700, Jason Gerecke wrote:
> Signed-off-by: Jason Gerecke <killert...@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
also, if you come up with a way to avoid this in the future - awesome. I'm
not happy with the current test suite, it is a burden, catches few actual
issues and breaks the build more often than not (well, that's kinda our
fault for not running it)
I do think we need a better approach here, but I don't know what that could
be yet.
Cheers,
Peter
> ---
> test/fake-symbols.c | 27 +++++++++++++++++++++++++++
> test/fake-symbols.h | 10 ++++++++++
> 2 files changed, 37 insertions(+)
>
> diff --git a/test/fake-symbols.c b/test/fake-symbols.c
> index 9ed632b..fe1663b 100644
> --- a/test/fake-symbols.c
> +++ b/test/fake-symbols.c
> @@ -90,6 +90,12 @@ xf86CheckStrOption(OPTTYPE optlist, const char *name, char
> *deflt)
> return NULL;
> }
>
> +_X_EXPORT int
> +xf86CheckBoolOption(OPTTYPE list, const char *name, int deflt)
> +{
> + return 0;
> +}
> +
> _X_EXPORT void
> xf86AddEnabledDevice(InputInfoPtr pInfo)
> {
> @@ -506,3 +512,24 @@ input_option_free_list(InputOption **opts)
> }
> }
> #endif
> +
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 16
> +_X_EXPORT Bool
> +InitTouchClassDeviceStruct(DeviceIntPtr device, unsigned int max_touches,
> + unsigned int mode, unsigned int numAxes) {
> + return TRUE;
> +}
> +
> +_X_EXPORT ValuatorMask *valuator_mask_new(int num_valuators) {
> + return NULL;
> +}
> +
> +_X_EXPORT void valuator_mask_set(ValuatorMask *mask, int valuator, int data)
> {
> + return;
> +}
> +
> +_X_EXPORT void xf86PostTouchEvent(DeviceIntPtr dev, uint32_t touchid,
> uint16_t type,
> + uint32_t flags, const ValuatorMask *mask) {
> + return;
> +}
> +#endif
> diff --git a/test/fake-symbols.h b/test/fake-symbols.h
> index 4b28745..3a99579 100644
> --- a/test/fake-symbols.h
> +++ b/test/fake-symbols.h
> @@ -22,6 +22,7 @@ extern char* xf86OptionName(OPTTYPE opt);
> extern CONST char* xf86FindOptionValue(OPTTYPE options, const char *name);
> extern int xf86NameCmp(const char *s1, const char *s2);
> extern char* xf86CheckStrOption(OPTTYPE optlist, const char *name, char
> *deflt);
> +extern int xf86CheckBoolOption(OPTTYPE list, const char *name, int deflt);
>
>
> extern char * xf86SetStrOption(OPTTYPE optlist, const char *name, CONST char
> *deflt);
> @@ -193,3 +194,12 @@ extern void TimerFree(OsTimerPtr timer);
>
> extern int xf86BlockSIGIO (void);
> extern void xf86UnblockSIGIO (int wasset);
> +
> +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 16
> +extern Bool InitTouchClassDeviceStruct(DeviceIntPtr device, unsigned int
> max_touches,
> + unsigned int mode, unsigned int numAxes);
> +extern ValuatorMask *valuator_mask_new(int num_valuators);
> +extern void valuator_mask_set(ValuatorMask *mask, int valuator, int data);
> +extern void xf86PostTouchEvent(DeviceIntPtr dev, uint32_t touchid, uint16_t
> type,
> + uint32_t flags, const ValuatorMask *mask);
> +#endif
> --
> 1.7.12.2
>
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
