diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
| commit | 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f (patch) | |
| tree | cfe0c736c95314edac7d9f1065be9c13026ed0c1 /xorg-server/hw/xfree86/common/xf86Events.c | |
| parent | 6b29aa4559aeb6f795caee047561654bfa0a1954 (diff) | |
| download | vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.gz vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.bz2 vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.zip | |
svn merge -r588:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Events.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Events.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Events.c b/xorg-server/hw/xfree86/common/xf86Events.c index ee4835233..9d3a58f91 100644 --- a/xorg-server/hw/xfree86/common/xf86Events.c +++ b/xorg-server/hw/xfree86/common/xf86Events.c @@ -567,7 +567,7 @@ addInputHandler(int fd, InputHandlerProc proc, pointer data) if (fd < 0 || !proc)
return NULL;
- ih = xcalloc(sizeof(*ih), 1);
+ ih = calloc(sizeof(*ih), 1);
if (!ih)
return NULL;
@@ -616,7 +616,7 @@ removeInputHandler(IHPtr ih) if (ih)
p->next = ih->next;
}
- xfree(ih);
+ free(ih);
}
int
|