[PATCH:xserver] Mark test_data static in Xinput protocol tests to avoid clashes

[Peter Hutterer]

On Sat, Apr 22, 2017 at 06:10:42PM -0700, Alan Coopersmith wrote:
> 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 at oracle.com>

remote: I: patch #151944 updated using rev f81343dd2fff49c70f53e3efdd40f8f89a38e460.
remote: I: 1 patch(es) updated to state Accepted.
To git+ssh://git.freedesktop.org/git/xorg/xserver

Cheers,
   Peter

> ---
>  test/xi2/protocol-xigetclientpointer.c  | 2 +-
>  test/xi2/protocol-xigetselectedevents.c | 2 +-
>  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 f0c27b9..9c38bd7 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 3a7f364..9a0fac5 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 db7e6ab..c703a1e 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;
>  
> -- 
> 2.7.4
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
>