Merge branch 'V8_4_BR'

[modules/gui.git] / src / GLViewer / GLViewer_Drawer.h

diff --git a/src/GLViewer/GLViewer_Drawer.h b/src/GLViewer/GLViewer_Drawer.h
index e454081a59d4673ffd990f07da880a361d04c059..f936da990d91b8e0f573060db9b0ab5d3f288767 100644 (file)
--- a/src/GLViewer/GLViewer_Drawer.h
+++ b/src/GLViewer/GLViewer_Drawer.h
@@ -36,7 +36,11 @@
 
 class QFile;
 
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
 #include <GL/gl.h>
+#endif
 
 #include "GLViewer.h"
 #include "GLViewer_Defs.h"
@@ -79,8 +83,8 @@ struct GLVIEWER_API GLViewer_TexFindId
   bool        myIsUndl;
   //! Font Size
   int         myPointSize;
-  //! View POrt ID
-  int         myViewPortId;
+  //! View Port ID
+  long        myViewPortId;
   //! Overloaded operator for using struct as MAP key
   bool operator < (const GLViewer_TexFindId theStruct) const 
   {