0023238: TKOpenGl glext header conflicts with system headers

diff --git a/.gitignore b/.gitignore
index 071f26c..fa94263 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /.adm
 /sun
 /lin
 /.adm
 /sun
 /lin

+/mac

 /ao1
 /sil
 /wnt
 /ao1
 /sil
 /wnt


@@ -15,3 +16,5 @@
 # /adm/
 /adm/win32
 /adm/win64
 # /adm/
 /adm/win32
 /adm/win64

+/adm/mac
+/adm/lin

diff --git a/src/OpenGl/OpenGl_GlCore11.hxx b/src/OpenGl/OpenGl_GlCore11.hxx
index 3aa3137..6932fdf 100644 (file)
--- 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 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
   #include <OpenGL/glu.h>
   #define __X_GL_H // prevent chaotic gl.h inclusions to avoid compile errors
 #else