aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkb/xkbActions.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-01-25 07:52:57 +0000
committermarha <marha@users.sourceforge.net>2010-01-25 07:52:57 +0000
commita0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a (patch)
tree3b69fe26769dc019dba91d2da08a2639ddd31e41 /xorg-server/xkb/xkbActions.c
parenta9768b035f2c47be0908520474073cc68d225d8a (diff)
downloadvcxsrv-a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a.tar.gz
vcxsrv-a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a.tar.bz2
vcxsrv-a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a.zip
Git update 25/1/2010
Diffstat (limited to 'xorg-server/xkb/xkbActions.c')
-rw-r--r--xorg-server/xkb/xkbActions.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/xkb/xkbActions.c b/xorg-server/xkb/xkbActions.c
index b0ab427b6..75f3c722e 100644
--- a/xorg-server/xkb/xkbActions.c
+++ b/xorg-server/xkb/xkbActions.c
@@ -1016,7 +1016,7 @@ register int i;
if (xkbi->szFilters==0) {
xkbi->szFilters = 4;
- xkbi->filters = _XkbTypedCalloc(xkbi->szFilters,XkbFilterRec);
+ xkbi->filters = xcalloc(xkbi->szFilters, sizeof(XkbFilterRec));
/* 6/21/93 (ef) -- XXX! deal with allocation failure */
}
for (i=0;i<xkbi->szFilters;i++) {
@@ -1026,9 +1026,8 @@ register int i;
}
}
xkbi->szFilters*=2;
- xkbi->filters= _XkbTypedRealloc(xkbi->filters,
- xkbi->szFilters,
- XkbFilterRec);
+ xkbi->filters= xrealloc(xkbi->filters,
+ xkbi->szFilters * sizeof(XkbFilterRec));
/* 6/21/93 (ef) -- XXX! deal with allocation failure */
bzero(&xkbi->filters[xkbi->szFilters/2],
(xkbi->szFilters/2)*sizeof(XkbFilterRec));