0023238: TKOpenGl glext header conflicts with system headers

diff --git a/.gitignore b/.gitignore
index 071f26c537801105ad7f424009d511dbb5a5b0b6..fa942633353a4f29be0b1174f7299d25fb5fe16c 100644 (file)
--- 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 3aa3137a2068ee51028c96c54f6a286e3c127fad..6932fdf273f0a11ea35ed17b16dd6125b5c9961b 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 <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