X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ViewPort.cpp;h=f7edd5d5e297eedfa9f57f9df423408b86c420c4;hb=b948502434f1af72184656e478095dae3fe00f96;hp=21552a55dc41197dec1bef8d9072edff1a050cf0;hpb=7cc3d9e6696b77a8fdf396cbd55370de3f3ebd9e;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_ViewPort.cpp b/src/XGUI/XGUI_ViewPort.cpp index 21552a55d..f7edd5d5e 100644 --- a/src/XGUI/XGUI_ViewPort.cpp +++ b/src/XGUI/XGUI_ViewPort.cpp @@ -1,10 +1,4 @@ -#ifndef WIN32 -# ifndef GLX_GLXEXT_LEGACY -# define GLX_GLXEXT_LEGACY -# endif -# include -# include -#else +#ifdef WIN32 # include # include #endif @@ -21,6 +15,7 @@ #include #include #include +#include #ifdef WIN32 #include @@ -29,6 +24,15 @@ #endif #include +//qmetatype.h must be included before any header file that defines Bool +//see /QtCore/qmetatype.h:53 for more info +#ifndef WIN32 +# ifndef GLX_GLXEXT_LEGACY +# define GLX_GLXEXT_LEGACY +# endif +# include +# include +#endif static double rx = 0.; static double ry = 0.;