Attachment 1819 Details for Bug 1866 – define APIENTRY to prevent loading of window.h from GL/gl.h

[patch] define APIENTRY to prevent loading of window.h from GL/gl.h

glwindows.diff (text/plain), 2.92 KB, created by Alexander Gottwald on 2005-02-02 09:12:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Gottwald

Created: 2005-02-02 09:12:19 UTC

Size: 2.92 KB

patch

obsolete

>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;
>Index: programs/Xserver/GL/windows/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/GL/windows/Imakefile,v
>retrieving revision 1.3
>diff -u -r1.3 Imakefile
>--- programs/Xserver/GL/windows/Imakefile	13 Aug 2004 19:18:29 -0000	1.3
>+++ programs/Xserver/GL/windows/Imakefile	2 Feb 2005 17:02:33 -0000
>@@ -24,7 +24,11 @@
> #if defined(GlxUseWindows) && GlxUseWindows
>       CYGWIN_GL_DEFINES = -DUSE_OPENGL32
> #endif
>-      DEFINES = $(GLX_DEFINES) $(CYGWIN_GL_DEFINES)
>+#if defined(Win32Architecture)
>+# undef __stdcall
>+      APIENTRY_DEFS = -DAPIENTRY=__stdcall
>+#endif
>+      DEFINES = $(GLX_DEFINES) $(CYGWIN_GL_DEFINES) $(APIENTRY_DEFS)
> 
> NormalLibraryTarget(GLcore,$(OBJS))
> NormalLibraryObjectRule()
>Index: programs/Xserver/GL/glx/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/GL/glx/Imakefile,v
>retrieving revision 1.5
>diff -u -r1.5 Imakefile
>--- programs/Xserver/GL/glx/Imakefile	19 Aug 2004 07:34:43 -0000	1.5
>+++ programs/Xserver/GL/glx/Imakefile	2 Feb 2005 17:02:33 -0000
>@@ -46,10 +46,14 @@
> #if defined(DarwinArchitecture) && ((OSMajorVersion == 6 && OSMinorVersion < 3) || OSMajorVersion < 6)
>   NO_EXT_DEFS = -DMISSING_GL_EXTS
> #endif
>+#if defined(Win32Architecture)
>+# undef __stdcall
>+  APIENTRY_DEFS = -DAPIENTRY=__stdcall
>+#endif
> 
> XCOMM If you add "-DDEBUG" in DEFINES, then make sure you also
> XCOMM add DEBUG to the define in ../mesa/src/X/xf86glx.c
>-      DEFINES = $(GLX_DEFINES) $(NO_EXT_DEFS)
>+      DEFINES = $(GLX_DEFINES) $(NO_EXT_DEFS) $(APIENTRY_DEFS)
> 
> 
> #ifdef IHaveModules

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.