; * src/xterm.c (xi_populate_device_from_info): Minor ifdef cleanup.

diff --git a/src/xterm.c b/src/xterm.c
index 806933fd07ed99d75a7c4b2a632ed94df31d1510..ab43a8ec517aa3652bd3ddd9de8bc5f27e24650d 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5282,16 +5282,15 @@ xi_populate_device_from_info (struct xi_device_t *xi_device,
                                  * device->num_classes);
   values = NULL;
 #endif
-#ifdef HAVE_XINPUT2_2
-  xi_device->touchpoints = NULL;
-#endif
 
   xi_device->use = device->use;
+  xi_device->name = build_string (device->name);
+  xi_device->attachment = device->attachment;
+
 #ifdef HAVE_XINPUT2_2
+  xi_device->touchpoints = NULL;
   xi_device->direct_p = false;
 #endif
-  xi_device->name = build_string (device->name);
-  xi_device->attachment = device->attachment;
 
   for (c = 0; c < device->num_classes; ++c)
     {