diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-06-29 22:34:32 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-09 15:31:57 +0100 |
| commit | 9808c66ec37d5d99f58bdb6136ae96381cb9cfc8 (patch) | |
| tree | 691d14a7cae0711ab68bc396d60d51e4f045d5e7 /nx-X11/programs/Xserver/xkb/maprules.c | |
| parent | 2db519141865cd504351aabf042db5bdf2ac5d96 (diff) | |
| download | nx-libs-9808c66ec37d5d99f58bdb6136ae96381cb9cfc8.tar.gz nx-libs-9808c66ec37d5d99f58bdb6136ae96381cb9cfc8.tar.bz2 nx-libs-9808c66ec37d5d99f58bdb6136ae96381cb9cfc8.zip | |
Lift xkb to XORG-1.2.0 state
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/maprules.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/maprules.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/xkb/maprules.c b/nx-X11/programs/Xserver/xkb/maprules.c index c64e1f796..295f1acf6 100644 --- a/nx-X11/programs/Xserver/xkb/maprules.c +++ b/nx-X11/programs/Xserver/xkb/maprules.c @@ -58,12 +58,6 @@ #define PR_DEBUG2(s,a,b) #endif -#ifdef NEED_STRCASECMP -extern int _XkbStrCaseCmp(char *s1, char *s2); -#else -#define _XkbStrCaseCmp strcasecmp -#endif - /***====================================================================***/ #define DFLT_LINE_SIZE 128 @@ -1088,20 +1082,20 @@ int len,headingtype,extra_ndx = 0; for ( ; GetInputLine(file,&line,False); line.num_line= 0) { if (line.line[0]=='!') { tok = strtok(&(line.line[1]), " \t"); - if (_XkbStrCaseCmp(tok,"model") == 0) + if (strcasecmp(tok,"model") == 0) headingtype = HEAD_MODEL; - else if (_XkbStrCaseCmp(tok,"layout") == 0) + else if (strcasecmp(tok,"layout") == 0) headingtype = HEAD_LAYOUT; - else if (_XkbStrCaseCmp(tok,"variant") == 0) + else if (strcasecmp(tok,"variant") == 0) headingtype = HEAD_VARIANT; - else if (_XkbStrCaseCmp(tok,"option") == 0) + else if (strcasecmp(tok,"option") == 0) headingtype = HEAD_OPTION; else { int i; headingtype = HEAD_EXTRA; extra_ndx= -1; for (i=0;(i<rules->num_extra)&&(extra_ndx<0);i++) { - if (!_XkbStrCaseCmp(tok,rules->extra_names[i])) + if (!strcasecmp(tok,rules->extra_names[i])) extra_ndx= i; } if (extra_ndx<0) { |