Attachment 1818 Details for Bug 1866 – Include Xwindows.h befor GL/gl.h on windows to prevent loading windows.h which pollutes our namespace with some symbols

[patch] Include Xwindows.h befor GL/gl.h on windows to prevent loading windows.h which pollutes our namespace with some symbols

glwindows.diff (text/plain), 1.74 KB, created by Alexander Gottwald on 2005-02-02 07:00:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Gottwald

Created: 2005-02-02 07:00:33 UTC

Size: 1.74 KB

patch

obsolete

>Index: lib/GL/glx/compsize.c
>===================================================================
>RCS file: /cvs/xorg/xc/lib/GL/glx/compsize.c,v
>retrieving revision 1.3
>diff -u -r1.3 compsize.c
>--- lib/GL/glx/compsize.c	16 Jun 2004 09:35:43 -0000	1.3
>+++ lib/GL/glx/compsize.c	2 Feb 2005 14:59:06 -0000
>@@ -34,6 +34,9 @@
> **
> */
> 
>+#ifdef WIN32
>+#include <Xwindows.h>
>+#endif
> #include <GL/gl.h>
> #include "glxclient.h"
> #include "size.h"
>Index: programs/Xserver/GL/windows/glwrap.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/GL/windows/glwrap.c,v
>retrieving revision 1.3
>diff -u -r1.3 glwrap.c
>--- programs/Xserver/GL/windows/glwrap.c	27 Jan 2005 20:33:34 -0000	1.3
>+++ programs/Xserver/GL/windows/glwrap.c	2 Feb 2005 14:59:06 -0000
>@@ -5,15 +5,12 @@
>  * Authors: Alexander Gottwald
>  */
> 
>+#include <Xwindows.h>
> #include <GL/gl.h>
> #include <GL/glext.h>
> #include <glxserver.h>
> #include <glxext.h>
> 
>-#define WINDOWS_LEAN_AND_CLEAN
>-#include <windows.h>
>-
>-
> #define RESOLVE_RET(procname, symbol, retval) \
>     static Bool init = TRUE; \
>     static procname proc = NULL; \
>Index: programs/Xserver/GL/windows/glwindows.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/GL/windows/glwindows.h,v
>retrieving revision 1.3
>diff -u -r1.3 glwindows.h
>--- programs/Xserver/GL/windows/glwindows.h	13 Aug 2004 19:18:29 -0000	1.3
>+++ programs/Xserver/GL/windows/glwindows.h	2 Feb 2005 14:59:06 -0000
>@@ -1,3 +1,4 @@
>+#include <Xwindows.h>
> #include <GL/gl.h>
> #include <GL/glext.h>
> 
>@@ -19,9 +20,6 @@
> #include <GL/internal/glcore.h>
> #include <stdlib.h>
> 
>-#define WINDOWS_LEAN_AND_CLEAN
>-#include <windows.h>
>-
> 
> typedef struct {
>     unsigned enableDebug : 1;

Actions: View | Splinter Review

Attachments on bug 1866: 1312 | 1818 | 1819

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.