From b1db572cfc5e6e0dd529099b20e99a05ca61e44f Mon Sep 17 00:00:00 2001
From: kgv <kgv@opencascade.com>
Date: Fri, 15 Jun 2012 11:56:23 +0400
Subject: [PATCH] 0023101: TKOpenGl possible glext header conflicts

Fixed glext header conflict with system X11 gl.h on Mac OS X
System header provide syntactically different typedefs for some OpenGL functions (GLenum vs. GLint).
Fixed misprint in comments
---
 src/OpenGl/OpenGl_GlCore11.hxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/OpenGl/OpenGl_GlCore11.hxx b/src/OpenGl/OpenGl_GlCore11.hxx
index cca428a0f1..3aa3137a20 100644
--- a/src/OpenGl/OpenGl_GlCore11.hxx
+++ b/src/OpenGl/OpenGl_GlCore11.hxx
@@ -45,8 +45,10 @@
 #define GL_GLEXT_LEGACY
 
 // include main OpenGL header provided with system
-#if defined(__APPLE__) && !defined(MACOSX_USE_GLX)
+#if defined(__APPLE__)
   #include <OpenGL/OpenGL.h>
+  #include <OpenGL/glu.h>
+  #define __X_GL_H // prevent chaotic gl.h inclusions to avoid compile errors
 #else
   #include <GL/gl.h>
   #include <GL/glu.h>