Dimitry Andric authored Feb 19, 2020 and Matt Turner committed Feb 19, 2020

xkbcomp.c:228:37: error: result of comparison against a string literal is unspecified (use an explicit string comparison function instead) [-Werror,-Wstring-compare]
        if ((argv[i][0] != '-') || (uStringEqual(argv[i], "-")))
                                    ^~~~~~~~~~~~~~~~~~~~~~~~~~
./utils.h:195:30: note: expanded from macro 'uStringEqual'
                                 ^~~~~~~~~~~~~~~~~~~~~
./utils.h:198:38: note: expanded from macro 'uStringCompare'
                                 (s1)!=(s2):strcmp(s1,s2))
                                     ^ ~~~~

Don't attempt to do this macro trickery, and simply use strcmp instead,
where it applies.

Bug: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244235