*** empty log message ***

Geo/OCCIncludes.h

@@ -108,5 +108,11 @@ using std::iostream;
 #include "BRepAlgoAPI_Cut.hxx"
 #endif
 
+// some Windows versions define min/max macros! 
+#if defined(WIN32)
+#undef min
+#undef max
+#endif
+
 #endif
 

Geo/OCCVertex.cpp

@@ -4,11 +4,11 @@
 // bugs and problems to <gmsh@geuz.org>.
 
 #include "GModel.h"
+#include "MVertex.h"
+#include "MElement.h"
 #include "OCCVertex.h"
 #include "OCCEdge.h"
 #include "OCCFace.h"
-#include "MVertex.h"
-#include "MElement.h"
 
 #if defined(HAVE_OCC)
 

Geo/OCCVertex.h

@@ -7,8 +7,8 @@
 #define _OCC_VERTEX_H_
 
 #include "GModel.h"
-#include "OCCIncludes.h"
 #include "GVertex.h"
+#include "OCCIncludes.h"
 
 #if defined(HAVE_OCC)