From 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 16 May 2010 20:50:58 +0000 Subject: svn merge -r588:HEAD ^/branches/released . --- xorg-server/hw/xfree86/modes/xf86Cursors.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xorg-server/hw/xfree86/modes/xf86Cursors.c') diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c index 3e765e6ff..e9770f8b9 100644 --- a/xorg-server/hw/xfree86/modes/xf86Cursors.c +++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c @@ -551,7 +551,7 @@ xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags) if (!cursor_info) return FALSE; - xf86_config->cursor_image = xalloc (max_width * max_height * 4); + xf86_config->cursor_image = malloc(max_width * max_height * 4); if (!xf86_config->cursor_image) { @@ -661,7 +661,7 @@ xf86_cursors_fini (ScreenPtr screen) } if (xf86_config->cursor_image) { - xfree (xf86_config->cursor_image); + free(xf86_config->cursor_image); xf86_config->cursor_image = NULL; } if (xf86_config->cursor) -- cgit v1.2.3