From b4adec886c65e49cfbd30d1e3a41b613f75ed3f5 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri, 29 May 2009 14:44:40 -0700
Subject: [PATCH] GLX: Purge glxint.h usage

Change (__GLXvisualConfig *) to (void *) in ABI compat stubs.
---
 glx/glxext.h     | 2 +-
 glx/glxscreens.c | 2 +-
 glx/glxserver.h  | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/glx/glxext.h b/glx/glxext.h
index a81850cef..3260a6c1e 100644
--- a/glx/glxext.h
+++ b/glx/glxext.h
@@ -58,7 +58,7 @@ typedef struct {
         );
     void (*setVisualConfigs)(
         int                nconfigs,
-        __GLXvisualConfig *configs,
+        void              *configs,
         void              **privates
         );
 } __GLXextensionInfo;
diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index f4839b32c..7b0eb0ce6 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -274,7 +274,7 @@ glxGetScreen(ScreenPtr pScreen)
 }
 
 void GlxSetVisualConfigs(int nconfigs, 
-                         __GLXvisualConfig *configs, void **privates)
+                         void *configs, void **privates)
 {
     /* We keep this stub around for the DDX drivers that still
      * call it. */
diff --git a/glx/glxserver.h b/glx/glxserver.h
index 518868981..627125874 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -60,7 +60,6 @@
 #define GL_GLEXT_PROTOTYPES /* we want prototypes */
 #include <GL/gl.h>
 #include <GL/glxproto.h>
-#include <GL/glxint.h>
 
 /* For glxscreens.h */
 typedef struct __GLXdrawable __GLXdrawable;
@@ -98,7 +97,7 @@ extern __GLXclientState *glxGetClient(ClientPtr pClient);
 void GlxExtensionInit(void);
 
 void GlxSetVisualConfigs(int nconfigs, 
-                         __GLXvisualConfig *configs, void **privates);
+                         void *configs, void **privates);
 
 struct _glapi_table;
 void GlxSetRenderTables (struct _glapi_table *table);