andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mark test_data static in Xinput protocol tests to avoid clashes

Browse Source 
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>
This commit is contained in:
Alan Coopersmith 2017-04-22 18:10:42 -07:00 committed by Peter Hutterer
parent 7bfb87a213
commit f81343dd2f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/xi2/protocol-xigetclientpointer.c
View File

@ -40,7 +40,7 @@
#include "protocol-common.h"
struct {
static struct {
int cp_is_set;
DeviceIntPtr dev;
int win;

2
test/xi2/protocol-xigetselectedevents.c
View File

@ -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;

2
test/xi2/protocol-xipassivegrabdevice.c
View File

@ -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;