Changed to avoid conflicts with windows standard headers.

Author: bontempiuchc

Solver/src/ReportClient.cpp

@@ -1,19 +1,27 @@
-#if defined(_WIN32)
-  #ifndef NOMINMAX
-    #define NOMINMAX
-  #endif
-  #ifndef WIN32_LEAN_AND_MEAN
-    #define WIN32_LEAN_AND_MEAN
-  #endif
-  #include <windows.h>
-
-  // Defensive cleanup for common macro collisions from legacy/project headers
-  #ifdef Source
-    #undef Source
-  #endif
-  #ifdef Destination
-    #undef Destination
-  #endif
+#ifdef _WIN32
+	#ifndef WIN32_LEAN_AND_MEAN
+	  #define WIN32_LEAN_AND_MEAN
+	#endif
+	#ifndef NOMINMAX
+	  #define NOMINMAX
+	#endif
+	#ifndef NOGDI
+	  #define NOGDI
+	#endif
+	#include <windows.h>
+	// Defensive cleanup for common macro collisions from legacy/project headers
+	#ifdef Source
+		#undef Source
+	#endif
+	#ifdef Destination
+		#undef Destination
+	#endif
+	#ifdef POINT
+		#undef POINT
+	#endif
+	#ifdef FIXED
+		#undef FIXED
+	#endif
 #endif
 
 #include <MPoint.h>

Solver/src/intersection.cpp

@@ -17,9 +17,27 @@
 #include "clipper.hpp"
 //#define TIMEIT 
 #ifdef TIMEIT 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef max
+#ifdef _WIN32
+  #ifndef WIN32_LEAN_AND_MEAN
+	#define WIN32_LEAN_AND_MEAN
+  #endif
+  #ifndef NOMINMAX
+	#define NOMINMAX
+  #endif
+  #ifndef NOGDI
+	#define NOGDI
+  #endif
+  #include <windows.h>
+	#ifdef POINT
+		#undef POINT
+	#endif
+	#ifdef FIXED
+		#undef FIXED
+	#endif
+	#endif
+	#ifdef max
+		#undef max
+	#endif
 #endif
 //temp for debugging
 namespace ClipperLib {

matlab/clipperLink/matlabClipper.cpp

@@ -6,10 +6,26 @@
 #include <MBridge/Figure.h>
 #include <stdint.h>
 #include <cassert>
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+
+#ifdef _WIN32
+	#ifndef WIN32_LEAN_AND_MEAN
+		#define WIN32_LEAN_AND_MEAN
+	#endif
+	#ifndef NOMINMAX
+		#define NOMINMAX
+	#e	ndif
+	#ifndef NOGDI
+		#define NOGDI
+	#endif
+	#include <windows.h>
+	#ifdef POINT
+		#undef POINT
+	#endif
+	#ifdef FIXED
+		#undef FIXED
+	#endif
 #endif
+
 typedef matlabLink::MData<int64_t> iArray;
 
 void fillClipper(const iArray & xa, const iArray &ya, ClipperLib::Path &dest) {

matlab/clipperLink/mexClipper.cpp

@@ -5,9 +5,24 @@
 #include <MBridge/FronTierAdapt.h>
 #include <MBridge/Figure.h>
 #include <stdint.h>
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+
+#ifdef _WIN32
+	#ifndef WIN32_LEAN_AND_MEAN
+		#define WIN32_LEAN_AND_MEAN
+	#endif
+	#ifndef NOMINMAX
+		#define NOMINMAX
+	#endif
+	#ifndef NOGDI
+		#define NOGDI
+	#endif
+	#include <windows.h>
+	#ifdef POINT
+		#undef POINT
+	#endif
+	#ifdef FIXED
+		#undef FIXED
+	#endif
 #endif
 
 using spatial::Point2D;