Bug 1866 - Win32 changes for gl.h
Summary: Win32 changes for gl.h
Status: RESOLVED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: Server/Ext/GLX (show other bugs)
Version: git
Hardware: x86 (IA32) Windows (All)
: high normal
Assignee: Alexander Gottwald
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 1802
  Show dependency tree / graph
 
Reported: 2004-11-15 07:17 UTC by Alexander Gottwald
Modified: 2007-01-23 17:34 UTC (History)
0 users

See Also:
i915 platform:
i915 features:

Attachments
Changes #include <windows.h> to <Xwindows.h> (624 bytes, patch)
2004-11-15 07:19 UTC, Alexander Gottwald 		no flags Details | Splinter Review
Include Xwindows.h befor GL/gl.h on windows to prevent loading windows.h which pollutes our namespace with some symbols (1.74 KB, patch)
2005-02-02 07:00 UTC, Alexander Gottwald 		no flags Details | Splinter Review
define APIENTRY to prevent loading of window.h from GL/gl.h (2.92 KB, patch)
2005-02-02 09:12 UTC, Alexander Gottwald 		no flags Details | Splinter Review
Show Obsolete (2) View All

Description Alexander Gottwald 2004-11-15 07:17:50 UTC 
I've changed the include from windows.h to Xwindows.h. XWindows.h take care of
some namespace clashes between windows and X11 headers.

Please commit the changes to the vendor branch
Comment 1 Alexander Gottwald 2004-11-15 07:19:44 UTC 
Created attachment 1312 [details] [review]
Changes #include <windows.h> to <Xwindows.h>
Comment 2 Alexander Gottwald 2005-02-02 07:00:33 UTC 
Created attachment 1818 [details] [review]
Include Xwindows.h befor GL/gl.h on windows to prevent loading windows.h which pollutes our namespace with some symbols

The patch for GL/gl.h is now obsolete
Comment 3 Alexander Gottwald 2005-02-02 07:05:05 UTC 
Comment on attachment 1818 [details] [review]
Include Xwindows.h befor GL/gl.h on windows to prevent loading windows.h which pollutes our namespace with some symbols

commited to HEAD

/cvs/xorg/xc/ChangeLog,v  <--  ChangeLog
new revision: 1.747; previous revision: 1.746
/cvs/xorg/xc/lib/GL/glx/compsize.c,v  <--  lib/GL/glx/compsize.c
new revision: 1.4; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/GL/windows/glwrap.c,v  <-- 
programs/Xserver/GL/windows/glwrap.c
new revision: 1.4; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/GL/windows/glwindows.h,v	<-- 
programs/Xserver/GL/windows/glwindows.h
new revision: 1.4; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/GL/windows/ChangeLog,v  <-- 
programs/Xserver/GL/windows/ChangeLog
new revision: 1.6; previous revision: 1.5
Comment 4 Alexander Gottwald 2005-02-02 07:06:04 UTC 
marking bug as fixed
Comment 5 Alexander Gottwald 2005-02-02 09:12:19 UTC 
Created attachment 1819 [details] [review]
define APIENTRY to prevent loading of window.h from GL/gl.h

More files needed a change and some from mesa too. By defining APIENTRY for
windows I can prevent <GL/gl.h> from loading <windows.h>
Comment 6 Alexander Gottwald 2005-02-02 09:18:43 UTC 
Comment on attachment 1819 [details] [review]
define APIENTRY to prevent loading of window.h from GL/gl.h

commited to head

/cvs/xorg/xc/programs/Xserver/GL/glx/Imakefile,v  <-- 
programs/Xserver/GL/glx/I
makefile
new revision: 1.6; previous revision: 1.5
/cvs/xorg/xc/programs/Xserver/GL/windows/Imakefile,v  <-- 
programs/Xserver/GL/w
indows/Imakefile
new revision: 1.4; previous revision: 1.3
/cvs/xorg/xc/programs/Xserver/GL/windows/ChangeLog,v  <-- 
programs/Xserver/GL/w
indows/ChangeLog
new revision: 1.7; previous revision: 1.6
/cvs/xorg/xc/ChangeLog,v  <--  ChangeLog
new revision: 1.748; previous revision: 1.747

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.