From a915739887477b28d924ecc8417ee107d125bd6c Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 6 Sep 2009 18:48:27 +0000 Subject: Switched to xorg-server-1.6.99.900.tar.gz --- xorg-server/hw/dmx/glxProxy/glxutil.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'xorg-server/hw/dmx/glxProxy/glxutil.c') diff --git a/xorg-server/hw/dmx/glxProxy/glxutil.c b/xorg-server/hw/dmx/glxProxy/glxutil.c index e3056bbd4..d0ce50486 100644 --- a/xorg-server/hw/dmx/glxProxy/glxutil.c +++ b/xorg-server/hw/dmx/glxProxy/glxutil.c @@ -28,19 +28,12 @@ * Silicon Graphics, Inc. */ -#define NEED_REPLIES -#define FONT_PCF #include "glxserver.h" #include #include #include #include "glxutil.h" - -#undef Xmalloc -#undef Xcalloc -#undef Xrealloc -#undef Xfree - +#include /************************************************************************/ @@ -58,7 +51,7 @@ __glXMalloc(size_t size) if (size == 0) { return NULL; } - addr = (void *) xalloc(size); + addr = malloc(size); if (addr == NULL) { /* XXX: handle out of memory error */ return NULL; @@ -75,7 +68,7 @@ __glXCalloc(size_t numElements, size_t elementSize) if ((numElements == 0) || (elementSize == 0)) { return NULL; } - addr = xcalloc(numElements, elementSize); + addr = calloc(numElements, elementSize); if (addr == NULL) { /* XXX: handle out of memory error */ return NULL; @@ -93,13 +86,13 @@ __glXRealloc(void *addr, size_t newSize) xfree(addr); return NULL; } else { - newAddr = xrealloc(addr, newSize); + newAddr = realloc(addr, newSize); } } else { if (newSize == 0) { return NULL; } else { - newAddr = xalloc(newSize); + newAddr = malloc(newSize); } } if (newAddr == NULL) { @@ -113,6 +106,6 @@ void __glXFree(void *addr) { if (addr) { - xfree(addr); + free(addr); } } -- cgit v1.2.3