Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[xsrc/trunk]: xsrc/external/mit/xorg-server/dist protect dup typedef.



details:   https://anonhg.NetBSD.org/xsrc/rev/c358c357ad40
branches:  trunk
changeset: 10094:c358c357ad40
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jan 22 20:25:45 2019 +0000

description:
protect dup typedef.

diffstat:

 external/mit/xorg-server/dist/glx/glxscreens.h      |  3 +++
 external/mit/xorg-server/dist/include/glx_extinit.h |  3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diffs (28 lines):

diff -r 7157d682b0e8 -r c358c357ad40 external/mit/xorg-server/dist/glx/glxscreens.h
--- a/external/mit/xorg-server/dist/glx/glxscreens.h    Sat Jan 19 11:50:05 2019 +0000
+++ b/external/mit/xorg-server/dist/glx/glxscreens.h    Tue Jan 22 20:25:45 2019 +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);
 
diff -r 7157d682b0e8 -r c358c357ad40 external/mit/xorg-server/dist/include/glx_extinit.h
--- a/external/mit/xorg-server/dist/include/glx_extinit.h       Sat Jan 19 11:50:05 2019 +0000
+++ b/external/mit/xorg-server/dist/include/glx_extinit.h       Tue Jan 22 20:25:45 2019 +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;



Home | Main Index | Thread Index | Old Index