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/lib/X11/ModMap.c | |
| 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/lib/X11/ModMap.c')
| -rw-r--r-- | nx-X11/lib/X11/ModMap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/lib/X11/ModMap.c b/nx-X11/lib/X11/ModMap.c index 49a5d08e8..ca15dde25 100644 --- a/nx-X11/lib/X11/ModMap.c +++ b/nx-X11/lib/X11/ModMap.c @@ -34,7 +34,7 @@ XModifierKeymap * XGetModifierMapping(register Display *dpy) { xGetModifierMappingReply rep; - register xReq *req; + _X_UNUSED register xReq *req; unsigned long nbytes; XModifierKeymap *res; @@ -84,7 +84,7 @@ XSetModifierMapping( req->length += mapSize >> 2; req->numKeyPerModifier = modifier_map->max_keypermod; - Data(dpy, modifier_map->modifiermap, mapSize); + Data(dpy, (const char *)modifier_map->modifiermap, mapSize); (void) _XReply(dpy, (xReply *) & rep, (SIZEOF(xSetModifierMappingReply) - SIZEOF(xReply)) >> 2, xTrue); |