From: kgv <kgv@opencascade.com>
Date: Thu, 12 Apr 2012 04:55:12 +0000 (+0400)
Subject: 0023101: TKOpenGl possible glext header conflicts
X-Git-Tag: V6_5_3~15
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=833e2f54e4b1bf1ece42b98b4ed547d7ca91fa64;p=occt-copy.git

0023101: TKOpenGl possible glext header conflicts
---

diff --git a/src/OpenGl/OpenGl_GlCore11.hxx b/src/OpenGl/OpenGl_GlCore11.hxx
index b3dfeb233e..cca428a0f1 100644
--- a/src/OpenGl/OpenGl_GlCore11.hxx
+++ b/src/OpenGl/OpenGl_GlCore11.hxx
@@ -41,9 +41,11 @@
 // current TKOpenGl implementation is incompatible with native OpenGL on MacOS X
 #define MACOSX_USE_GLX
 
+// exclude modern definitions and system-provided glext.h, should be defined before gl.h inclusion
+#define GL_GLEXT_LEGACY
+
 // include main OpenGL header provided with system
 #if defined(__APPLE__) && !defined(MACOSX_USE_GLX)
-  #define GL_GLEXT_LEGACY // exclude modern definitions
   #include <OpenGL/OpenGL.h>
 #else
   #include <GL/gl.h>