diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2017-04-22 18:10:42 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2017-04-24 11:05:04 +1000 |
| commit | f81343dd2fff49c70f53e3efdd40f8f89a38e460 (patch) | |
| tree | a3f2aab8c2e41675ebbd98f7126edafb6dd14ec5 /test | |
| parent | 7bfb87a2137853295ecc9e544a15626cfd773a02 (diff) | |
Mark test_data static in Xinput protocol tests to avoid clashes
Fixes warning from Solaris linker:
ld: warning: symbol 'test_data' has differing sizes:
(file tests-protocol-xigetselectedevents.o value=0x418;
file tests-protocol-xigetclientpointer.o value=0x18);
tests-protocol-xigetselectedevents.o definition taken
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'test')
| -rw-r--r-- | test/xi2/protocol-xigetclientpointer.c | 2 | ||||
| -rw-r--r-- | test/xi2/protocol-xigetselectedevents.c | 2 | ||||
| -rw-r--r-- | test/xi2/protocol-xipassivegrabdevice.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/xi2/protocol-xigetclientpointer.c b/test/xi2/protocol-xigetclientpointer.c index f0c27b933..9c38bd720 100644 --- a/test/xi2/protocol-xigetclientpointer.c +++ b/test/xi2/protocol-xigetclientpointer.c @@ -40,7 +40,7 @@ #include "protocol-common.h" -struct { +static struct { int cp_is_set; DeviceIntPtr dev; int win; diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c index 3a7f3641f..9a0fac5d4 100644 --- a/test/xi2/protocol-xigetselectedevents.c +++ b/test/xi2/protocol-xigetselectedevents.c @@ -54,7 +54,7 @@ static void reply_XIGetSelectedEvents(ClientPtr client, int len, char *data, static void reply_XIGetSelectedEvents_data(ClientPtr client, int len, char *data, void *userdata); -struct { +static struct { int num_masks_expected; unsigned char mask[MAXDEVICES][XI2LASTEVENT]; /* intentionally bigger */ int mask_len; diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c index db7e6abf7..c703a1ee8 100644 --- a/test/xi2/protocol-xipassivegrabdevice.c +++ b/test/xi2/protocol-xipassivegrabdevice.c @@ -47,7 +47,7 @@ static ClientRec client_request; #define N_MODS 7 static uint32_t modifiers[N_MODS] = { 1, 2, 3, 4, 5, 6, 7 }; -struct test_data { +static struct test_data { int num_modifiers; } testdata; |