From ee078149c7cd1499e3c526a77c8bb1aec1fa419e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 21 Sep 2008 21:35:40 +0000
Subject: [PATCH] *** empty log message ***

---
 Geo/OCCIncludes.h | 6 ++++++
 Geo/OCCVertex.cpp | 4 ++--
 Geo/OCCVertex.h   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Geo/OCCIncludes.h b/Geo/OCCIncludes.h
index e69b011ded..43626856dc 100644
--- a/Geo/OCCIncludes.h
+++ b/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
 
diff --git a/Geo/OCCVertex.cpp b/Geo/OCCVertex.cpp
index f5c142b5be..0c880f82f9 100644
--- a/Geo/OCCVertex.cpp
+++ b/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)
 
diff --git a/Geo/OCCVertex.h b/Geo/OCCVertex.h
index 4c359b4eba..8df227f0dc 100644
--- a/Geo/OCCVertex.h
+++ b/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)
 
-- 
GitLab