Merge branch 'master' into pre/V8_2_BR

[modules/gui.git] / src / GLViewer / GLViewer_BaseDrawers.cxx

diff --git a/src/GLViewer/GLViewer_BaseDrawers.cxx b/src/GLViewer/GLViewer_BaseDrawers.cxx
index cd27c7f04fc98f36600177f8be7903d09f719680..f675e769ef2a40f26e61f415396ca9a4db0d8bfb 100644 (file)
--- a/src/GLViewer/GLViewer_BaseDrawers.cxx
+++ b/src/GLViewer/GLViewer_BaseDrawers.cxx
@@ -34,8 +34,7 @@
 // Qt includes
 #include <QColor>
 
-
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__APPLE__)
 #include <GL/glx.h>
 #endif