diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-20 10:31:24 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-20 10:31:24 +0200 |
| commit | 61b8d44f1f76df5abb9e53427f07e9f1ad987e32 (patch) | |
| tree | f0f84ebfb28ec44254def01211eeca94c76aeed4 /nx-X11/programs/Xserver/xkb | |
| parent | da01dc8da1aedb1f75d62c03748a239c54b14483 (diff) | |
| parent | 50eb5e4a9bf812895a7d5c4e6ae0775c6910931f (diff) | |
| download | nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.tar.gz nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.tar.bz2 nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.zip | |
Merge branch 'uli42-pr/fix_compile_warnings' into 3.6.x
Attributes GH PR #230: https://github.com/ArcticaProject/nx-libs/pull/230
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/xkmread.c | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 3e4cf4acd..a78541e75 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -4402,7 +4402,7 @@ char * wire, *next; CARD16 len; wire= *wire_inout; - len= (CARD16 *)wire; + len = *(CARD16 *) wire; if (client->swapped) { swaps(&len); } diff --git a/nx-X11/programs/Xserver/xkb/xkmread.c b/nx-X11/programs/Xserver/xkb/xkmread.c index 18ab21dca..1d8f6d772 100644 --- a/nx-X11/programs/Xserver/xkb/xkmread.c +++ b/nx-X11/programs/Xserver/xkb/xkmread.c @@ -1085,7 +1085,8 @@ unsigned i,size_toc; } return 0; } - fread(file_info,SIZEOF(xkmFileInfo),1,file); + _X_UNUSED int ignored_result; + ignored_result = fread(file_info,SIZEOF(xkmFileInfo),1,file); size_toc= file_info->num_toc; if (size_toc>max_toc) { #ifdef DEBUG @@ -1095,7 +1096,7 @@ unsigned i,size_toc; size_toc= max_toc; } for (i=0;i<size_toc;i++) { - fread(&toc[i],SIZEOF(xkmSectionInfo),1,file); + ignored_result = fread(&toc[i],SIZEOF(xkmSectionInfo),1,file); } return 1; } @@ -1126,7 +1127,8 @@ int nRead; return 0; } fseek(file,toc->offset,SEEK_SET); - fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file); + _X_UNUSED int ignored_result; + ignored_result = fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file); nRead= SIZEOF(xkmSectionInfo); if ((tmpTOC.type!=toc->type)||(tmpTOC.format!=toc->format)|| (tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) { @@ -1201,7 +1203,8 @@ char name[100]; case XkmSymbolsIndex: case XkmGeometryIndex: fseek(file,toc->offset,SEEK_SET); - fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file); + _X_UNUSED int ignored_result; + ignored_result = fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file); if ((tmpTOC.type!=toc->type)||(tmpTOC.format!=toc->format)|| (tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) { _XkbLibError(_XkbErrIllegalContents,"XkmReadFileSectionName",0); |