From a7f914ef9256ee2d287e77384c01181734fd3df2 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 1 Dec 2010 17:52:55 +0000
Subject: Synchronised files between glx and mesalib

---
 xorg-server/glx/single2.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'xorg-server/glx/single2.c')

diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c
index 63a2a9d0e..4db7c889d 100644
--- a/xorg-server/glx/single2.c
+++ b/xorg-server/glx/single2.c
@@ -54,7 +54,7 @@ int __glXDisp_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
 {
     GLsizei size;
     GLenum type;
-    __GLXcontext *cx;
+    struct glx_context *cx;
     int error;
 
     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
@@ -82,7 +82,7 @@ int __glXDisp_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
 
 int __glXDisp_SelectBuffer(__GLXclientState *cl, GLbyte *pc)
 {
-    __GLXcontext *cx;
+    struct glx_context *cx;
     GLsizei size;
     int error;
 
@@ -112,7 +112,7 @@ int __glXDisp_RenderMode(__GLXclientState *cl, GLbyte *pc)
 {
     ClientPtr client;
     xGLXRenderModeReply reply;
-    __GLXcontext *cx;
+    struct glx_context *cx;
     GLint nitems=0, retBytes=0, retval, newModeCheck;
     GLubyte *retBuffer = NULL;
     GLenum newMode;
@@ -208,7 +208,7 @@ int __glXDisp_RenderMode(__GLXclientState *cl, GLbyte *pc)
 
 int __glXDisp_Flush(__GLXclientState *cl, GLbyte *pc)
 {
-	__GLXcontext *cx;
+	struct glx_context *cx;
 	int error;
 
 	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
@@ -223,7 +223,7 @@ int __glXDisp_Flush(__GLXclientState *cl, GLbyte *pc)
 
 int __glXDisp_Finish(__GLXclientState *cl, GLbyte *pc)
 {
-    __GLXcontext *cx;
+    struct glx_context *cx;
     ClientPtr client;
     int error;
 
@@ -311,7 +311,7 @@ char *__glXcombine_strings(const char *cext_string, const char *sext_string)
 int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap)
 {
     ClientPtr client;
-    __GLXcontext *cx;
+    struct glx_context *cx;
     GLenum name;
     const char *string;
     __GLX_DECLARE_SWAP_VARIABLES;
-- 
cgit v1.2.3