Module Name: xsrc
Committed By: joerg
Date: Sun Jul 13 16:37:45 UTC 2014
Modified Files:
xsrc/external/mit/libX11/dist/src/xkb: XKBMAlloc.c
Log Message:
Fix compare to actually do the right thing.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c
diff -u xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.1.1.6 xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.2
--- xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.1.1.6 Sun Mar 16 22:43:47 2014
+++ xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c Sun Jul 13 16:37:45 2014
@@ -302,7 +302,7 @@ XkbAddKeyType(XkbDescPtr xkb,
}
}
}
- 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;