diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-14 14:23:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-14 14:23:04 +0000 |
| commit | 2ddb14008968ea365e3d395487cad2bfe154da9d (patch) | |
| tree | f9d970e9dd6ee1ec835fedcadc15a8705a50e6d5 /xorg-server/hw/dmx/glxProxy/glxutil.c | |
| parent | b7a6351e37e788bb25415dc79aaf2718b48d6939 (diff) | |
| parent | 3815190d52f8ae453c2458335394eb5b18ab9bf5 (diff) | |
| download | vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.tar.gz vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.tar.bz2 vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/dmx/glxProxy/glxutil.c')
| -rw-r--r-- | xorg-server/hw/dmx/glxProxy/glxutil.c | 75 |
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);
-}
|