Attachment #568166 for bug #672634

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





/* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
#define __glext_h_
#define __gl_glext_h_
#define __glxext_h_
#define __glx_glxext_h_
#include <GL/gl.h>
#undef  __glext_h_
#undef  __gl_glext_h_
#undef  __glxext_h_
#undef  __glx_glxext_h_

#endif /* ALLEGRO_MACOSX */


Lines 1-7 Link Here

(-)a/include/allegro5/opengl/GLext/glx_ext_defs.h (+2 lines)
1	/* HACK: Prevent both Mesa and SGI's broken headers from screwing us */	1	/* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
2	#define __glxext_h_	2	#define __glxext_h_
		3	#define __glx_glxext_h_
3	#include <GL/glx.h>	4	#include <GL/glx.h>
4	#undef __glxext_h_	5	#undef __glxext_h_
		6	#undef __glx_glxext_h_
5		7
6	#ifndef GLX_VERSION_1_3	8	#ifndef GLX_VERSION_1_3
7	#define _ALLEGRO_GLX_VERSION_1_3	9	#define _ALLEGRO_GLX_VERSION_1_3

Return to bug 672634

Lines 103-112 Link Here

(-)a/include/allegro5/allegro_opengl.h (+4 lines)
103		103
104	/* HACK: Prevent both Mesa and SGI's broken headers from screwing us */	104	/* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
105	#define __glext_h_	105	#define __glext_h_
		106	#define __gl_glext_h_
106	#define __glxext_h_	107	#define __glxext_h_
		108	#define __glx_glxext_h_
107	#include <GL/gl.h>	109	#include <GL/gl.h>
108	#undef __glext_h_	110	#undef __glext_h_
		111	#undef __gl_glext_h_
109	#undef __glxext_h_	112	#undef __glxext_h_
		113	#undef __glx_glxext_h_
110		114
111	#endif /* ALLEGRO_MACOSX */	115	#endif /* ALLEGRO_MACOSX */
112		116