xkbcomp: Changes to 'master'

[GitLab Mirror]

 xkbcomp.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e200d0d41ef3158ea717206c1490e499a0c07f1b
Author: Dimitry Andric <dimitry at andric.com>
Date:   Wed Feb 19 21:24:59 2020 +0100

    Don't compare with string literals
    
    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