? o
Index: glx/glxscreens.h
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xorg-server/dist/glx/glxscreens.h,v
retrieving revision 1.1.1.6
diff -u -u -r1.1.1.6 glxscreens.h
--- glx/glxscreens.h	31 Dec 2018 09:36:08 -0000	1.1.1.6
+++ glx/glxscreens.h	22 Jan 2019 19:34:39 -0000
@@ -116,7 +116,10 @@
 ** and DDX layers of the GLX server extension.  The methods provide an
 ** interface for context management on a screen.
 */
+#ifndef __GLXscreen
+#define __GLXscreen __GLXscreen
 typedef struct __GLXscreen __GLXscreen;
+#endif
 struct __GLXscreen {
     void (*destroy) (__GLXscreen * screen);
 
Index: include/glx_extinit.h
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xorg-server/dist/include/glx_extinit.h,v
retrieving revision 1.1.1.2
diff -u -u -r1.1.1.2 glx_extinit.h
--- include/glx_extinit.h	31 Dec 2018 09:36:08 -0000	1.1.1.2
+++ include/glx_extinit.h	22 Jan 2019 19:34:39 -0000
@@ -30,7 +30,10 @@
 /* XXX this comment no longer makes sense i think */
 #ifdef GLXEXT
 typedef struct __GLXprovider __GLXprovider;
+#ifndef __GLXscreen
+#define __GLXscreen __GLXscreen
 typedef struct __GLXscreen __GLXscreen;
+#endif
 struct __GLXprovider {
     __GLXscreen *(*screenProbe) (ScreenPtr pScreen);
     const char *name;