xserver libX11 pixman git update 14/9/2010

1 files changed, 0 insertions, 75 deletions

diff --git a/xorg-server/hw/dmx/glxProxy/glxutil.c b/xorg-server/hw/dmx/glxProxy/glxutil.c
index ad34eef05..1b9ad6962 100644
--- a/xorg-server/hw/dmx/glxProxy/glxutil.c
+++ b/xorg-server/hw/dmx/glxProxy/glxutil.c
@@ -29,81 +29,6 @@
  */

 

 #include "glxserver.h"

-#include <GL/glxtokens.h>

-#include <pixmapstr.h>

-#include <windowstr.h>

 #include "glxutil.h"

-#include <stdlib.h>

-

-/************************************************************************/

 

 void __glXNop(void) {}

-

-/************************************************************************/

-

-/* Memory Allocation for GLX */

-

-void *

-__glXMalloc(size_t size)

-{

-    void *addr;

-

-    if (size == 0) {

-	return NULL;

-    }

-    addr = malloc(size);

-    if (addr == NULL) {

-	/* XXX: handle out of memory error */

-	return NULL;

-    }

-    return addr;

-}

-

-void *

-__glXCalloc(size_t numElements, size_t elementSize)

-{

-    void *addr;

-    size_t size;

-

-    if ((numElements == 0) || (elementSize == 0)) {

-	return NULL;

-    }

-    addr = calloc(numElements, elementSize);

-    if (addr == NULL) {

-	/* XXX: handle out of memory error */

-	return NULL;

-    }

-    return addr;

-}

-

-void *

-__glXRealloc(void *addr, size_t newSize)

-{

-    void *newAddr;

-

-    if (addr) {

-	if (newSize == 0) {

-	    free(addr);

-	    return NULL;

-	} else {

-	    newAddr = realloc(addr, newSize);

-	}

-    } else {

-	if (newSize == 0) {

-	    return NULL;

-	} else {

-	    newAddr = malloc(newSize);

-	}

-    }

-    if (newAddr == NULL) {

-	return NULL;	/* XXX: out of memory */

-    }

-

-    return newAddr;

-}

-

-void

-__glXFree(void *addr)

-{

-    free(addr);

-}