diff options
author | marha <marha@users.sourceforge.net> | 2010-02-05 14:14:04 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-02-05 14:14:04 +0000 |
commit | 1cd320f8b4b3d09beb757bea617cac34d36bcb78 (patch) | |
tree | a61f78d2a77620096f64bcd794ac0021772974ab /xorg-server/xkb/XKBAlloc.c | |
parent | 950eb1cc5e0edfc1daf7a69d1803aca794cede14 (diff) | |
parent | 7fe172c9035f56977209da12a7fd67d8badd71a2 (diff) | |
download | vcxsrv-1cd320f8b4b3d09beb757bea617cac34d36bcb78.tar.gz vcxsrv-1cd320f8b4b3d09beb757bea617cac34d36bcb78.tar.bz2 vcxsrv-1cd320f8b4b3d09beb757bea617cac34d36bcb78.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkb/XKBAlloc.c')
-rw-r--r-- | xorg-server/xkb/XKBAlloc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/xkb/XKBAlloc.c b/xorg-server/xkb/XKBAlloc.c index 6464e9970..d40aa3345 100644 --- a/xorg-server/xkb/XKBAlloc.c +++ b/xorg-server/xkb/XKBAlloc.c @@ -315,22 +315,22 @@ XkbFreeKeyboard(XkbDescPtr xkb,unsigned which,Bool freeAll) if (freeAll) which= XkbAllComponentsMask; if (which&XkbClientMapMask) - XkbFreeClientMap(xkb,XkbAllClientInfoMask,True); + XkbFreeClientMap(xkb,XkbAllClientInfoMask,TRUE); if (which&XkbServerMapMask) - XkbFreeServerMap(xkb,XkbAllServerInfoMask,True); + XkbFreeServerMap(xkb,XkbAllServerInfoMask,TRUE); if (which&XkbCompatMapMask) - XkbFreeCompatMap(xkb,XkbAllCompatMask,True); + XkbFreeCompatMap(xkb,XkbAllCompatMask,TRUE); if (which&XkbIndicatorMapMask) XkbFreeIndicatorMaps(xkb); if (which&XkbNamesMask) - XkbFreeNames(xkb,XkbAllNamesMask,True); + XkbFreeNames(xkb,XkbAllNamesMask,TRUE); if ((which&XkbGeometryMask) && (xkb->geom!=NULL)) { - XkbFreeGeometry(xkb->geom,XkbGeomAllMask,True); + XkbFreeGeometry(xkb->geom,XkbGeomAllMask,TRUE); /* PERHAPS BONGHITS etc */ xkb->geom = NULL; } if (which&XkbControlsMask) - XkbFreeControls(xkb,XkbAllControlsMask,True); + XkbFreeControls(xkb,XkbAllControlsMask,TRUE); if (freeAll) xfree(xkb); return; |