--- OLD/xc/lib/Xtst/XTest.c	Thu Jan  1 00:00:00 1970
+++ NEW/xc/lib/Xtst/XTest.c	Thu Jan  1 00:00:00 1970
@@ -76,7 +76,7 @@
     first_event = 0;
 
     XQueryExtension(dpy, INAME, &major_opcode, &first_event, &first_error);
-    return (XPointer)first_event;
+    return (XPointer)first_event; /* XXX pointer/integer interface botch -Mouse */
 }
 
 static XEXT_GENERATE_FIND_DISPLAY (find_display, xtest_info,
@@ -277,7 +277,7 @@
 
     req->deviceid |= MORE_EVENTS;
     req->length += ((n_axes + 5) / 6) * (SIZEOF(xEvent) >> 2);
-    ev.type = XI_DeviceValuator + (int)info->data;
+    ev.type = XI_DeviceValuator + (int)info->data; /* XXX pointer/integer interface botch -Mouse */
     ev.deviceid = dev->device_id;
     ev.num_valuators = n_axes;
     ev.first_valuator = first_axis;
@@ -325,7 +325,7 @@
     req->reqType = info->codes->major_opcode;
     req->xtReqType = X_XTestFakeInput;
     req->type = is_press ? XI_DeviceKeyPress : XI_DeviceKeyRelease;
-    req->type += (int)info->data;
+    req->type += (int)info->data; /* XXX pointer/integer interface botch -Mouse */
     req->detail = keycode;
     req->time = delay;
     req->deviceid = dev->device_id;
@@ -355,7 +355,7 @@
     req->reqType = info->codes->major_opcode;
     req->xtReqType = X_XTestFakeInput;
     req->type = is_press ? XI_DeviceButtonPress : XI_DeviceButtonRelease;
-    req->type += (int)info->data;
+    req->type += (int)info->data; /* XXX pointer/integer interface botch -Mouse */
     req->detail = button;
     req->time = delay;
     req->deviceid = dev->device_id;
@@ -384,7 +384,7 @@
     req->reqType = info->codes->major_opcode;
     req->xtReqType = X_XTestFakeInput;
     req->type = in_prox ? XI_ProximityIn : XI_ProximityOut;
-    req->type += (int)info->data;
+    req->type += (int)info->data; /* XXX pointer/integer interface botch -Mouse */
     req->time = delay;
     req->deviceid = dev->device_id;
     if (n_axes)
@@ -413,7 +413,7 @@
     GetReq(XTestFakeInput, req);
     req->reqType = info->codes->major_opcode;
     req->xtReqType = X_XTestFakeInput;
-    req->type = XI_DeviceMotionNotify + (int)info->data;
+    req->type = XI_DeviceMotionNotify + (int)info->data; /* XXX pointer/integer interface botch -Mouse */
     req->detail = is_relative;
     req->time = delay;
     req->deviceid = dev->device_id;