aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/xkb/XKBMAlloc.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-02-28 00:55:13 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-28 00:55:13 +0100
commit1918bcb9c01fcf45727b514afb8ca8d978a2bf93 (patch)
treea678fc2c488d1f8121cc736575e682541f465e95 /nx-X11/programs/Xserver/xkb/XKBMAlloc.c
parenta6cb8583adb16f299e968be4a8e99e903966e1d8 (diff)
parent00e3e95e5f40de2aaf5bb920bc51a311404889fc (diff)
downloadnx-libs-1918bcb9c01fcf45727b514afb8ca8d978a2bf93.tar.gz
nx-libs-1918bcb9c01fcf45727b514afb8ca8d978a2bf93.tar.bz2
nx-libs-1918bcb9c01fcf45727b514afb8ca8d978a2bf93.zip
Merge branch 'uli42-pr/update_xkb' into 3.6.x
Attributes GH PR #648: https://github.com/ArcticaProject/nx-libs/pull/648
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/XKBMAlloc.c')
-rw-r--r--nx-X11/programs/Xserver/xkb/XKBMAlloc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/xkb/XKBMAlloc.c b/nx-X11/programs/Xserver/xkb/XKBMAlloc.c
index 66b20b89e..dbd9b25a0 100644
--- a/nx-X11/programs/Xserver/xkb/XKBMAlloc.c
+++ b/nx-X11/programs/Xserver/xkb/XKBMAlloc.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif
-
#include <stdio.h>
#include <nx-X11/X.h>
#include <nx-X11/Xproto.h>
@@ -39,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <nx-X11/keysym.h>
#include <xkbsrv.h>
-
/***====================================================================***/
Status
@@ -298,7 +296,7 @@ XkbClientMapPtr map;
}
}
}
- if ((!map)||(!map->types)||(!map->num_types<XkbNumRequiredTypes)) {
+ if ((!map)||(!map->types)||(!(map->num_types<XkbNumRequiredTypes))) {
tmp= XkbNumRequiredTypes+1;
if (XkbAllocClientMap(xkb,XkbKeyTypesMask,tmp)!=Success)
return NULL;