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

[Po Lu]

branch: master
commit 2ebfd7188f07e8c0c4e88d17e094d6fdd59f4769
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    ; * src/xterm.c (xi_populate_device_from_info): Minor ifdef cleanup.
---
 src/xterm.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index 806933fd07..ab43a8ec51 100644
--- 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)
     {