diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-02 11:01:43 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-02 11:01:43 +0100 |
| commit | 554a6fa760de47c497abcc91bb5f1f9b2756a407 (patch) | |
| tree | f59b0c8ddd14dc414c952710b2010477107cde06 /nx-X11/programs/Xserver/xkb | |
| parent | f42d36fb73e096113a948a04279b752689f157bc (diff) | |
| parent | 9c3669c6b7ff19013b3684bb74d98ec3d121e329 (diff) | |
| download | nx-libs-554a6fa760de47c497abcc91bb5f1f9b2756a407.tar.gz nx-libs-554a6fa760de47c497abcc91bb5f1f9b2756a407.tar.bz2 nx-libs-554a6fa760de47c497abcc91bb5f1f9b2756a407.zip | |
Merge branch 'sunweaver-pr/constify-atom-name-strings' into 3.6.x
Attributes GH PR #363: https://github.com/ArcticaProject/nx-libs/pull/363
Diffstat (limited to 'nx-X11/programs/Xserver/xkb')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkb.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbtext.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index a78541e75..47f4a2f96 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -3529,7 +3529,7 @@ register int i,bit; static Bool _XkbCheckTypeName(Atom name,int typeNdx) { -char * str; +const char * str; str= NameForAtom(name); if ((strcmp(str,"ONE_LEVEL")==0)||(strcmp(str,"TWO_LEVEL")==0)|| diff --git a/nx-X11/programs/Xserver/xkb/xkbtext.c b/nx-X11/programs/Xserver/xkb/xkbtext.c index d9888342e..273ba5aae 100644 --- a/nx-X11/programs/Xserver/xkb/xkbtext.c +++ b/nx-X11/programs/Xserver/xkb/xkbtext.c @@ -75,7 +75,7 @@ XkbAtomText(Display *dpy,Atom atm,unsigned format) { char *rtrn,*tmp; - tmp= XkbAtomGetString(dpy,atm); + tmp= (char *)XkbAtomGetString(dpy,atm); if (tmp!=NULL) { int len; len= strlen(tmp)+1; @@ -118,7 +118,7 @@ char numBuf[20]; if (ndx>=XkbNumVirtualMods) tmp= "illegal"; else if (vmodNames&&(vmodNames[ndx]!=None)) - tmp= XkbAtomGetString(dpy,vmodNames[ndx]); + tmp= (char *)XkbAtomGetString(dpy,vmodNames[ndx]); if (tmp==NULL) sprintf(tmp=numBuf,"%d",ndx); |