tools: don't depend on src/utils.h

The idea is to make the tools/demos as standalone as possible so that
they may serve as examples as well.

Signed-off-by: Ran Benita <ran@unusedvar.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/interactive-evdev.c b/tools/interactive-evdev.c
index e09da6a..e8afb5e 100644
--- a/tools/interactive-evdev.c
+++ b/tools/interactive-evdev.c
@@ -459,11 +459,11 @@ main(int argc, char *argv[])
     }
     else {
         struct xkb_rule_names rmlvo = {
-            .rules = isempty(rules) ? NULL : rules,
-            .model = isempty(model) ? NULL : model,
-            .layout = isempty(layout) ? NULL : layout,
-            .variant = isempty(variant) ? NULL : variant,
-            .options = isempty(options) ? NULL : options
+            .rules = (rules == NULL || rules[0] == '\0') ? NULL : rules,
+            .model = (model == NULL || model[0] == '\0') ? NULL : model,
+            .layout = (layout == NULL || layout[0] == '\0') ? NULL : layout,
+            .variant = (variant == NULL || variant[0] == '\0') ? NULL : variant,
+            .options = (options == NULL || options[0] == '\0') ? NULL : options
         };
 
         if (!rules && !model && !layout && !variant && !options)