summaryrefslogtreecommitdiff
path: root/xserver/Xi/xiselectev.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-12-05 15:36:12 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-12-05 15:36:12 +0000
commita90ee792d96752ad1b71b9ada922fa6afe478c99 (patch)
tree6143b00f7646951d23dfe2a4fe2992ca40b77069 /xserver/Xi/xiselectev.c
parentbc97d4ecc0aa9e1b823565b07282f848700bd11a (diff)
Upgrade to xorg-server 1.9.2.
Tested by ajacoutot@, krw@, shadchin@ and jasper@ on various configurations including multihead with both zaphod and xrandr.
Diffstat (limited to 'xserver/Xi/xiselectev.c')
-rw-r--r--xserver/Xi/xiselectev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xserver/Xi/xiselectev.c b/xserver/Xi/xiselectev.c
index 672edab3b..7aa3f0ab6 100644
--- a/xserver/Xi/xiselectev.c
+++ b/xserver/Xi/xiselectev.c
@@ -173,7 +173,7 @@ ProcXISelectEvents(ClientPtr client)
RecalculateDeliverableEvents(win);
- xfree(types);
+ free(types);
return Success;
}
@@ -234,7 +234,7 @@ ProcXIGetSelectedEvents(ClientPtr client)
return Success;
}
- buffer = xcalloc(MAXDEVICES, sizeof(xXIEventMask) + pad_to_int32(XI2MASKSIZE));
+ buffer = calloc(MAXDEVICES, sizeof(xXIEventMask) + pad_to_int32(XI2MASKSIZE));
if (!buffer)
return BadAlloc;
@@ -281,7 +281,7 @@ ProcXIGetSelectedEvents(ClientPtr client)
if (reply.num_masks)
WriteToClient(client, reply.length * 4, buffer);
- xfree(buffer);
+ free(buffer);
return Success;
}