diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-03-02 10:03:31 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-03-03 09:59:12 +1000 |
| commit | 1d9a055bc8e95f20458d7da5b77967f2e53b7d6f (patch) | |
| tree | 0b588e21d392062821193a477cffd44b20f5fa57 /test | |
| parent | 9d227cd0bd985e7dcb7923974361145ba1d78713 (diff) | |
test: add ifdefs to allow running tests against 1.7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Chris Bagwell <chris@cnpbagwell.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/fake-symbols.c | 10 | ||||
| -rw-r--r-- | 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, |