diff options
author | marha <marha@users.sourceforge.net> | 2010-01-25 08:22:27 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-01-25 08:22:27 +0000 |
commit | 724396e50bc811ea09416afbe00a8420d60647bf (patch) | |
tree | fd5f6baeaad8ae7cc680dae46e1ae633544ee2a9 /xorg-server/xkb/XKBGAlloc.c | |
parent | 2ddb9669098ba260d0667276b5d1e7999c72b993 (diff) | |
parent | a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a (diff) | |
download | vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.tar.gz vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.tar.bz2 vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkb/XKBGAlloc.c')
-rw-r--r-- | xorg-server/xkb/XKBGAlloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/xkb/XKBGAlloc.c b/xorg-server/xkb/XKBGAlloc.c index 752b11a94..0bab39a23 100644 --- a/xorg-server/xkb/XKBGAlloc.c +++ b/xorg-server/xkb/XKBGAlloc.c @@ -615,7 +615,7 @@ XkbGeometryPtr geom; Status rtrn; if (xkb->geom==NULL) { - xkb->geom= _XkbTypedCalloc(1,XkbGeometryRec); + xkb->geom= xcalloc(1, sizeof(XkbGeometryRec)); if (!xkb->geom) return BadAlloc; } |