xserver: Branch 'master'

[Kristian Høgsberg]

 hw/dmx/glxProxy/glxcmds.c     |    7 +++----
 hw/dmx/glxProxy/glxcmdsswap.c |    7 +++----
 hw/dmx/glxProxy/glxext.c      |   12 ++++++------
 hw/dmx/glxProxy/glxserver.h   |    1 -
 hw/dmx/glxProxy/glxutil.c     |    3 +--
 hw/dmx/glxProxy/glxvisuals.c  |    1 +
 6 files changed, 14 insertions(+), 17 deletions(-)

New commits:
diff-tree f029e9a32dcaa95b84e08ec173a0cc78fd92bdbf (from 4c225a3a8b2e7e5e5510347d8473f1318bbac769)
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Sat Jul 15 22:05:38 2006 -0400

    Un-glx-libcwrap DMX GLX proxy so it works without GL/include.

diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c
index d7ea707..f18b1fb 100644
--- a/hw/dmx/glxProxy/glxcmds.c
+++ b/hw/dmx/glxProxy/glxcmds.c
@@ -59,7 +59,6 @@
 #include "glxutil.h"
 #include "glxext.h"
 #include "unpack.h"
-#include "GL/glx_ansic.h"
 
 #include "GL/glxproto.h"
 #include "glxvendor.h"
@@ -158,7 +157,7 @@ static int CreateContext(__GLXclientStat
     if (!glxc) {
 	return BadAlloc;
     }
-    __glXMemset(glxc, 0, sizeof(__GLXcontext));
+    memset(glxc, 0, sizeof(__GLXcontext));
 
     pScreen = screenInfo.screens[screen];
     pGlxScreen = &__glXActiveScreens[screen];
@@ -610,7 +609,7 @@ static int AddCurrentContext(__GLXclient
     cl->currentContexts = table;
     cl->numCurrentContexts++;
 
-    __glXMemset(cl->be_currentCTag + num*screenInfo.numScreens, 0, 
+    memset(cl->be_currentCTag + num*screenInfo.numScreens, 0, 
 	         screenInfo.numScreens * sizeof(GLXContextTag));
 
     return num+1;
@@ -2589,7 +2588,7 @@ int __glXClientInfo(__GLXclientState *cl
     cl->GLClientminorVersion = req->minor;
     if (cl->GLClientextensions) __glXFree(cl->GLClientextensions);
     buf = (const char *)(req+1);
-    cl->GLClientextensions = __glXStrdup(buf);
+    cl->GLClientextensions = strdup(buf);
 
     to_screen = screenInfo.numScreens - 1;
 
diff --git a/hw/dmx/glxProxy/glxcmdsswap.c b/hw/dmx/glxProxy/glxcmdsswap.c
index 565793e..25f8c5d 100644
--- a/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/hw/dmx/glxProxy/glxcmdsswap.c
@@ -44,7 +44,6 @@
 #include <windowstr.h>
 #include "unpack.h"
 #include "glxext.h"
-#include "GL/glx_ansic.h"
 #include "glxvendor.h"
 
 extern int glxIsExtensionSupported( char *ext );
@@ -714,7 +713,7 @@ int __glXSwapRenderLarge(__GLXclientStat
 	    }
 	    cl->largeCmdBufSize = hdr->length;
 	}
-	__glXMemcpy(cl->largeCmdBuf, pc, req->dataBytes);
+	memcpy(cl->largeCmdBuf, pc, req->dataBytes);
 
 	cl->largeCmdBytesSoFar = req->dataBytes;
 	cl->largeCmdBytesTotal = hdr->length;
@@ -737,7 +736,7 @@ int __glXSwapRenderLarge(__GLXclientStat
 	    return __glXBadLargeRequest;
        }
 
-       __glXMemcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, 
+       memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, 
 	           pc, req->dataBytes);
 
        cl->largeCmdBytesSoFar += req->dataBytes;
@@ -759,7 +758,7 @@ int __glXSwapRenderLarge(__GLXclientStat
 	    return __glXBadLargeRequest;
        }
 
-       __glXMemcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, 
+       memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, 
 	           pc, req->dataBytes);
 
        cl->largeCmdBytesSoFar += req->dataBytes;
diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c
index 5ddfbe6..872cfaf 100644
--- a/hw/dmx/glxProxy/glxext.c
+++ b/hw/dmx/glxProxy/glxext.c
@@ -79,7 +79,7 @@ static void ResetClientState(int clientI
     }
 
     keep_be_displays = cl->be_displays;
-    __glXMemset(cl, 0, sizeof(__GLXclientState));
+    memset(cl, 0, sizeof(__GLXclientState));
     cl->be_displays = keep_be_displays;
 
     /*
@@ -90,7 +90,7 @@ static void ResetClientState(int clientI
     cl->GLClientminorVersion = 0;
     if (cl->GLClientextensions) __glXFree(cl->GLClientextensions);
 
-    __glXMemset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
+    memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
 }
 
 
@@ -414,14 +414,14 @@ static int __glXDispatch(ClientPtr clien
 	if (!cl) {
 	    return BadAlloc;
 	}
-	__glXMemset(cl, 0, sizeof(__GLXclientState));
+	memset(cl, 0, sizeof(__GLXclientState));
 
 	cl->be_displays = (Display **) __glXMalloc( screenInfo.numScreens * sizeof(Display *) );
 	if (!cl->be_displays) {
 	    __glXFree( cl );
 	    return BadAlloc;
 	}
-	__glXMemset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
+	memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
     }
     
     if (!cl->inUse) {
@@ -468,7 +468,7 @@ static int __glXSwapDispatch(ClientPtr c
 	if (!cl) {
 	    return BadAlloc;
 	}
-	__glXMemset(cl, 0, sizeof(__GLXclientState));
+	memset(cl, 0, sizeof(__GLXclientState));
 
 	cl->be_displays = (Display **) __glXMalloc( screenInfo.numScreens * sizeof(Display *) );
 	if (!cl->be_displays) {
@@ -476,7 +476,7 @@ static int __glXSwapDispatch(ClientPtr c
 	    return BadAlloc;
 	}
 
-	__glXMemset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
+	memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
     }
     
     if (!cl->inUse) {
diff --git a/hw/dmx/glxProxy/glxserver.h b/hw/dmx/glxProxy/glxserver.h
index 7db7efe..2b4ed0a 100644
--- a/hw/dmx/glxProxy/glxserver.h
+++ b/hw/dmx/glxProxy/glxserver.h
@@ -46,7 +46,6 @@
 #include <extnsionst.h>
 #include <resource.h>
 #include <scrnintstr.h>
-#include "GL/glx_ansic.h"
 
 
 /*
diff --git a/hw/dmx/glxProxy/glxutil.c b/hw/dmx/glxProxy/glxutil.c
index 822ef25..0893f15 100644
--- a/hw/dmx/glxProxy/glxutil.c
+++ b/hw/dmx/glxProxy/glxutil.c
@@ -41,7 +41,6 @@
 #include <pixmapstr.h>
 #include <windowstr.h>
 #include "glxutil.h"
-#include "GL/glx_ansic.h"
 
 /************************************************************************/
 
@@ -82,7 +81,7 @@ __glXCalloc(size_t numElements, size_t e
 	/* XXX: handle out of memory error */
 	return NULL;
     }
-    __glXMemset(addr, 0, size);
+    memset(addr, 0, size);
     return addr;
 }
 
diff --git a/hw/dmx/glxProxy/glxvisuals.c b/hw/dmx/glxProxy/glxvisuals.c
index c20e955..77bb137 100644
--- a/hw/dmx/glxProxy/glxvisuals.c
+++ b/hw/dmx/glxProxy/glxvisuals.c
@@ -37,6 +37,7 @@
 #include <dmx-config.h>
 #endif
 
+#include <assert.h>
 #include "dmx.h"
 #include "glxserver.h"
 #include "glxutil.h"