From 18e704f9aa15c563d3b161a11cd8d3c140cb4d1d Mon Sep 17 00:00:00 2001
From: Roderick Colenbrander <thunderbird2k@gmx.net>
Date: Wed, 30 Apr 2008 19:06:13 +0000
Subject: [PATCH] opengl32: Get rid of X/GLX leftovers.

---
 dlls/opengl32/opengl_ext.h | 1 -
 dlls/opengl32/wgl.c        | 3 ---
 dlls/winex11.drv/opengl.c  | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h
index 93afd0520d9..8ae7c2f4a95 100644
--- a/dlls/opengl32/opengl_ext.h
+++ b/dlls/opengl32/opengl_ext.h
@@ -26,7 +26,6 @@
 #define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */
 #define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
-#include <GL/glx.h>
 #ifdef HAVE_GL_GLEXT_H
 # include <GL/glext.h>
 #endif
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index df15b5baa54..6944f377b98 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -82,9 +82,6 @@ static char* internal_gl_extensions = NULL;
 
 typedef struct wine_glcontext {
   HDC hdc;
-  XVisualInfo *vis;
-  GLXFBConfig fb_conf;
-  GLXContext ctx;
   BOOL do_escape;
   /* ... more stuff here */
 } Wine_GLContext;
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index cf5dff7e96a..dbe66f19c9c 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -104,10 +104,10 @@ typedef struct wine_glpixelformat {
 
 typedef struct wine_glcontext {
     HDC hdc;
+    BOOL do_escape;
     XVisualInfo *vis;
     WineGLPixelFormat *fmt;
     GLXContext ctx;
-    BOOL do_escape;
     HDC read_hdc;
     Drawable drawables[2];
     BOOL refresh_drawables;
-- 
2.11.4.GIT