summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-06-02 16:21:59 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-06-07 13:28:55 +1000
commit9affea8cfd3f583647e9c6ea2b5debb97e6904c5 (patch)
tree60041d3c3e2e3d7ef7e18533bbb55f05d9227a44
parent641d1e9943208a8b2c2aef843bd17cb22f833b06 (diff)
Use Data, not Data32 in XIPassiveGrabDevice
Data32 takes and iterates over an array of longs, thus skipping every 4 bytes on LP64. Here we only have arrays of ints, use the normal Data macro instead. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 9faab2bc0bdd4d98a04e572a7a5201bfcd3bdc70)
-rw-r--r--src/XIPassiveGrab.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/XIPassiveGrab.c b/src/XIPassiveGrab.c
index feef74b..34f1bf3 100644
--- a/src/XIPassiveGrab.c
+++ b/src/XIPassiveGrab.c
@@ -67,9 +67,9 @@ _XIPassiveGrabDevice(Display* dpy, int deviceid, int grabtype, int detail,
buff = calloc(4, req->mask_len);
memcpy(buff, mask->mask, mask->mask_len);
- Data32(dpy, buff, req->mask_len * 4);
+ Data(dpy, buff, req->mask_len * 4);
for (i = 0; i < num_modifiers; i++)
- Data32(dpy, &modifiers_inout[i].modifiers, 4);
+ Data(dpy, (char*)&modifiers_inout[i].modifiers, 4);
free(buff);