WinMSYS2: use namespace GeometryUtils for Polygon, de-conflict wingdi.h

src/GeometryUtils.h

@@ -3,6 +3,8 @@
 #include "linalg.h"
 #include <vector>
 
+namespace GeometryUtils {
+
 typedef std::vector<Vector3d> Polygon;
 typedef std::vector<Polygon> Polygons;
 
@@ -25,7 +27,6 @@ struct IndexedPolyMesh {
 	std::vector<std::vector<IndexedFace> > polygons;
 };
 
-namespace GeometryUtils {
 	bool tessellatePolygon(const Polygon &polygon,
 												 Polygons &triangles,
 												 const Vector3f *normal = NULL);

src/cgalutils-applyops.cc

@@ -35,6 +35,8 @@
 #include <boost/foreach.hpp>
 #include <boost/unordered_set.hpp>
 
+using namespace GeometryUtils;
+
 namespace CGALUtils {
 
 	template<typename Polyhedron>

src/cgalutils-project.cc

@@ -35,6 +35,7 @@
 #include <boost/foreach.hpp>
 #include <boost/unordered_set.hpp>
 
+using namespace GeometryUtils;
 
 static void add_outline_to_poly(CGAL_Nef_polyhedron2::Explorer &explorer,
 								CGAL_Nef_polyhedron2::Explorer::Halfedge_around_face_const_circulator circ,

src/cgalutils.cc

@@ -35,6 +35,8 @@
 #include <boost/foreach.hpp>
 #include <boost/unordered_set.hpp>
 
+using namespace GeometryUtils;
+
 static CGAL_Nef_polyhedron *createNefPolyhedronFromPolySet(const PolySet &ps)
 {
 	if (ps.isEmpty()) return new CGAL_Nef_polyhedron();

src/polyset-utils.cc

@@ -11,6 +11,8 @@
 
 #include <boost/foreach.hpp>
 
+using namespace GeometryUtils;
+
 namespace PolysetUtils {
 
 	// Project all polygons (also back-facing) into a Polygon2d instance.

src/polyset.h

@@ -12,6 +12,8 @@
 #include <boost/logic/tribool.hpp>
 BOOST_TRIBOOL_THIRD_STATE(unknown)
 
+using namespace GeometryUtils;
+
 class PolySet : public Geometry
 {
 public: