aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/test/xi2/xi2.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-12-18 10:05:10 +0100
committermarha <marha@users.sourceforge.net>2012-12-18 10:05:10 +0100
commit1d46380a9bb69897acdadf71b80cd759b0493fad (patch)
treed8517cf38e0ac8a6ec098d92293e262e99a4c7b9 /xorg-server/test/xi2/xi2.c
parent18d9ddc200055ccf6bf285e578e4724159ff69d5 (diff)
parent293fd0043af7e861c9c540bebc44630d0da0bf9b (diff)
downloadvcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.tar.gz
vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.tar.bz2
vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver mesa git update 18 oct 2012
Diffstat (limited to 'xorg-server/test/xi2/xi2.c')
-rw-r--r--xorg-server/test/xi2/xi2.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/test/xi2/xi2.c b/xorg-server/test/xi2/xi2.c
index 6ee705293..1cdad1dbd 100644
--- a/xorg-server/test/xi2/xi2.c
+++ b/xorg-server/test/xi2/xi2.c
@@ -36,8 +36,14 @@ xi2mask_test(void)
XI2Mask *xi2mask = NULL, *mergemask = NULL;
unsigned char *mask;
DeviceIntRec dev;
+ DeviceIntRec all_devices, all_master_devices;
int i;
+ all_devices.id = XIAllDevices;
+ inputInfo.all_devices = &all_devices;
+ all_master_devices.id = XIAllMasterDevices;
+ inputInfo.all_master_devices = &all_master_devices;
+
/* size >= nmasks * 2 for the test cases below */
xi2mask = xi2mask_new_with_size(MAXDEVICES + 2, (MAXDEVICES + 2) * 2);
assert(xi2mask);