Module Name: xsrc
Committed By: christos
Date: Tue Jan 22 20:25:45 UTC 2019
Modified Files:
xsrc/external/mit/xorg-server/dist/glx: glxscreens.h
xsrc/external/mit/xorg-server/dist/include: glx_extinit.h
Log Message:
protect dup typedef.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xorg-server/dist/glx/glxscreens.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/include/glx_extinit.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/glx/glxscreens.h
diff -u xsrc/external/mit/xorg-server/dist/glx/glxscreens.h:1.1.1.6 xsrc/external/mit/xorg-server/dist/glx/glxscreens.h:1.2
--- xsrc/external/mit/xorg-server/dist/glx/glxscreens.h:1.1.1.6 Mon Dec 31 04:36:08 2018
+++ xsrc/external/mit/xorg-server/dist/glx/glxscreens.h Tue Jan 22 15:25:45 2019
@@ -116,7 +116,10 @@ GLint glxConvertToXVisualType(int visual
** 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: xsrc/external/mit/xorg-server/dist/include/glx_extinit.h
diff -u xsrc/external/mit/xorg-server/dist/include/glx_extinit.h:1.1.1.2 xsrc/external/mit/xorg-server/dist/include/glx_extinit.h:1.2
--- xsrc/external/mit/xorg-server/dist/include/glx_extinit.h:1.1.1.2 Mon Dec 31 04:36:08 2018
+++ xsrc/external/mit/xorg-server/dist/include/glx_extinit.h Tue Jan 22 15:25:45 2019
@@ -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;
