Index: XKBMAlloc.c
===================================================================
RCS file: /cvsroot/xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c,v
retrieving revision 1.2
diff -p -r1.2 XKBMAlloc.c
*** XKBMAlloc.c	13 Jul 2014 16:37:45 -0000	1.2
--- XKBMAlloc.c	19 Jul 2015 08:19:49 -0000
*************** XkbAddKeyType(XkbDescPtr xkb,
*** 302,308 ****
              }
          }
      }
!     if ((!map) || (!map->types) || !(map->num_types < XkbNumRequiredTypes)) {
          tmp = XkbNumRequiredTypes + 1;
          if (XkbAllocClientMap(xkb, XkbKeyTypesMask, tmp) != Success)
              return NULL;
--- 302,308 ----
              }
          }
      }
!     if ((!map) || (!map->types) || (map->num_types < XkbNumRequiredTypes)) {
          tmp = XkbNumRequiredTypes + 1;
          if (XkbAllocClientMap(xkb, XkbKeyTypesMask, tmp) != Success)
              return NULL;