diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-25 07:52:57 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-25 07:52:57 +0000 |
| commit | a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a (patch) | |
| tree | 3b69fe26769dc019dba91d2da08a2639ddd31e41 /xorg-server/xkb/xkb.c | |
| parent | a9768b035f2c47be0908520474073cc68d225d8a (diff) | |
| download | vcxsrv-a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a.tar.gz vcxsrv-a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a.tar.bz2 vcxsrv-a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a.zip | |
Git update 25/1/2010
Diffstat (limited to 'xorg-server/xkb/xkb.c')
| -rw-r--r-- | xorg-server/xkb/xkb.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c index bfed11406..ec26d6e7c 100644 --- a/xorg-server/xkb/xkb.c +++ b/xorg-server/xkb/xkb.c @@ -2777,9 +2777,8 @@ _XkbSetCompatMap(ClientPtr client, DeviceIntPtr dev, XkbSymInterpretPtr sym; if ((unsigned)(req->firstSI+req->nSI)>compat->num_si) { compat->num_si= req->firstSI+req->nSI; - compat->sym_interpret= _XkbTypedRealloc(compat->sym_interpret, - compat->num_si, - XkbSymInterpretRec); + compat->sym_interpret= xrealloc(compat->sym_interpret, + compat->num_si * sizeof(XkbSymInterpretRec)); if (!compat->sym_interpret) { compat->num_si= 0; return BadAlloc; @@ -6460,7 +6459,7 @@ _XkbSetDeviceInfoCheck(ClientPtr client, DeviceIntPtr dev, nBtns= dev->button->numButtons; acts= dev->button->xkb_acts; if (acts==NULL) { - acts= _XkbTypedCalloc(nBtns,XkbAction); + acts= xcalloc(nBtns, sizeof(XkbAction)); if (!acts) return BadAlloc; dev->button->xkb_acts= acts; |