From: kgv <kgv@opencascade.com>
Date: Tue, 3 Jul 2012 12:45:17 +0000 (+0400)
Subject: 0023238: TKOpenGl glext header conflicts with system headers
X-Git-Tag: V6_5_4_beta1~154
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=be34de4b943fdb134d751b29067380e482634de0;p=occt-copy.git

0023238: TKOpenGl glext header conflicts with system headers
---

diff --git a/.gitignore b/.gitignore
index 071f26c537..fa94263335 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /.adm
 /sun
 /lin
+/mac
 /ao1
 /sil
 /wnt
@@ -15,3 +16,5 @@
 # /adm/
 /adm/win32
 /adm/win64
+/adm/mac
+/adm/lin
diff --git a/src/OpenGl/OpenGl_GlCore11.hxx b/src/OpenGl/OpenGl_GlCore11.hxx
index 3aa3137a20..6932fdf273 100644
--- a/src/OpenGl/OpenGl_GlCore11.hxx
+++ b/src/OpenGl/OpenGl_GlCore11.hxx
@@ -46,7 +46,7 @@
 
 // include main OpenGL header provided with system
 #if defined(__APPLE__)
-  #include <OpenGL/OpenGL.h>
+  #include <OpenGL/gl.h>
   #include <OpenGL/glu.h>
   #define __X_GL_H // prevent chaotic gl.h inclusions to avoid compile errors
 #else