1 files changed, 8 insertions, 16 deletions
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 9628dffb8..fa7031e6c 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -628,14 +628,10 @@ SDeviceLeaveNotifyEvent (xXILeaveEvent *from, xXILeaveEvent *to)
     swapl(&to->root, n);
     swapl(&to->event, n);
     swapl(&to->child, n);
-    swaps(&to->root_x.integral, n);
-    swaps(&to->root_x.frac, n);
-    swaps(&to->root_y.integral, n);
-    swaps(&to->root_y.frac, n);
-    swaps(&to->event_x.integral, n);
-    swaps(&to->event_x.frac, n);
-    swaps(&to->event_y.integral, n);
-    swaps(&to->event_y.frac, n);
+    swapl(&to->root_x, n);
+    swapl(&to->root_y, n);
+    swapl(&to->event_x, n);
+    swapl(&to->event_y, n);
     swaps(&to->sourceid, n);
     swaps(&to->buttons_len, n);
     swapl(&to->mods.base_mods, n);
@@ -721,14 +717,10 @@ static void SDeviceEvent(xXIDeviceEvent *from, xXIDeviceEvent *to)
     swapl(&to->root, n);
     swapl(&to->event, n);
     swapl(&to->child, n);
-    swapl(&to->root_x.integral, n);
-    swapl(&to->root_x.frac, n);
-    swapl(&to->root_y.integral, n);
-    swapl(&to->root_y.frac, n);
-    swapl(&to->event_x.integral, n);
-    swapl(&to->event_x.frac, n);
-    swapl(&to->event_y.integral, n);
-    swapl(&to->event_y.frac, n);
+    swapl(&to->root_x, n);
+    swapl(&to->root_y, n);
+    swapl(&to->event_x, n);
+    swapl(&to->event_y, n);
     swaps(&to->buttons_len, n);
     swaps(&to->valuators_len, n);
     swaps(&to->sourceid, n);