Attachment #392294 for bug #533412

View | Details | Raw Unified | Return to bug 533412
Collapse All | Expand All

Lines 21-26 Link Here

(-)a/inc/InterfaceGraphic_X11.hxx (+1 lines)
21	#include <X11/Xlib.h>	21	#include <X11/Xlib.h>
22	#include <X11/Xutil.h>	22	#include <X11/Xutil.h>
23	#include <X11/Xatom.h>	23	#include <X11/Xatom.h>
		24	#define GLX_GLXEXT_LEGACY
24	#include <GL/glx.h>	25	#include <GL/glx.h>
25		26
26	#if defined (sun) \|\| defined (SUNOS) \|\| defined (__alpha) \|\| defined (DECOSF1) \|\| defined (sgi) \|\| defined (IRIX) \|\| defined (__hpux)\|\| defined (HPUX)	27	#if defined (sun) \|\| defined (SUNOS) \|\| defined (__alpha) \|\| defined (DECOSF1) \|\| defined (sgi) \|\| defined (IRIX) \|\| defined (__hpux)\|\| defined (HPUX)

Lines 28-33 Link Here

(-)a/samples/qt/Common/src/View.cxx (+1 lines)
28	#include <Cocoa_Window.hxx>	28	#include <Cocoa_Window.hxx>
29	#else	29	#else
30	#include <QX11Info>	30	#include <QX11Info>
		31	#define GLX_GLXEXT_LEGACY
31	#include <GL/glx.h>	32	#include <GL/glx.h>
32	#include <X11/Xutil.h>	33	#include <X11/Xutil.h>
33	#include <X11/Xatom.h>	34	#include <X11/Xatom.h>

Lines 21-26 Link Here

(-)a/src/InterfaceGraphic/InterfaceGraphic_X11.hxx (+1 lines)
21	#include <X11/Xlib.h>	21	#include <X11/Xlib.h>
22	#include <X11/Xutil.h>	22	#include <X11/Xutil.h>
23	#include <X11/Xatom.h>	23	#include <X11/Xatom.h>
		24	#define GLX_GLXEXT_LEGACY
24	#include <GL/glx.h>	25	#include <GL/glx.h>
25		26
26	#if defined (sun) \|\| defined (SUNOS) \|\| defined (__alpha) \|\| defined (DECOSF1) \|\| defined (sgi) \|\| defined (IRIX) \|\| defined (__hpux)\|\| defined (HPUX)	27	#if defined (sun) \|\| defined (SUNOS) \|\| defined (__alpha) \|\| defined (DECOSF1) \|\| defined (sgi) \|\| defined (IRIX) \|\| defined (__hpux)\|\| defined (HPUX)

Lines 39-44 Link Here

(-)a/src/OpenGl/OpenGl_Context.cxx (+1 lines)
39	#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)	39	#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
40	#include <dlfcn.h>	40	#include <dlfcn.h>
41	#else	41	#else
		42	#define GLX_GLXEXT_LEGACY
42	#include <GL/glx.h> // glXGetProcAddress()	43	#include <GL/glx.h> // glXGetProcAddress()
43	#endif	44	#endif
44		45

Lines 32-37 Link Here

(-)a/src/OpenGl/OpenGl_Workspace_Raytrace.cxx (+1 lines)
32	#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)	32	#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
33	#include <OpenGL/CGLCurrent.h>	33	#include <OpenGL/CGLCurrent.h>
34	#else	34	#else
		35	#define GLX_GLXEXT_LEGACY
35	#include <GL/glx.h>	36	#include <GL/glx.h>
36	#endif	37	#endif
37		38

Lines 20-25 Link Here

(-)a/src/Xw/Xw_Window.cxx (-1 / +1 lines)
20	#include <Aspect_Convert.hxx>	20	#include <Aspect_Convert.hxx>
21	#include <Aspect_WindowDefinitionError.hxx>	21	#include <Aspect_WindowDefinitionError.hxx>
22		22
		23	#define GLX_GLXEXT_LEGACY
23	#include <GL/glx.h>	24	#include <GL/glx.h>
24		25
25	namespace	26	namespace
26	-

Return to bug 533412