From 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 16 May 2010 20:50:58 +0000
Subject: svn merge -r588:HEAD ^/branches/released .

---
 xorg-server/hw/xfree86/common/xf86Events.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xorg-server/hw/xfree86/common/xf86Events.c')

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
-- 
cgit v1.2.3