diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2017-01-18 09:00:10 -0800 |
|---|---|---|
| committer | Jason Gerecke <killertofu@gmail.com> | 2017-01-20 09:21:21 -0800 |
| commit | f0dedf7a610ac97bc45738492b98ce4f1e0514ec (patch) | |
| tree | a4d920d87af7ddda06b1b90a39c9f2f7bd58a87c | |
| parent | 6ff54b3020268f7baf8f1e748a6e278126472c58 (diff) | |
| download | xf86-input-wacom-f0dedf7a610ac97bc45738492b98ce4f1e0514ec.tar.gz | |
tests: Fix compilation under ABI 25 and greater
The X server recently deprecated xf86BlockSIGIO and xf86UnblockSIGIO and
simultaneously defined them inline within xf86.h. The new inline definition
causes problems both because fake-symbols.c will end up redefining them,
and because the function bodies reference a symbol that does not get included
when building the tests. To fix these errors, update fake-symbols.c with
updated include guards and a definition of the undefined symbols.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | test/fake-symbols.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/test/fake-symbols.c b/test/fake-symbols.c index 6f2c10a..e649fb9 100644 --- a/test/fake-symbols.c +++ b/test/fake-symbols.c @@ -493,6 +493,7 @@ void TimerFree(OsTimerPtr timer) { } +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 24 int xf86BlockSIGIO (void) { @@ -503,6 +504,15 @@ void xf86UnblockSIGIO (int wasset) { } +#else +void input_lock (void) +{ +} + +void input_unlock (void) +{ +} +#endif /* This is not the same as the X server one, but it'll do for the tests */ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14 |