From 20789087d989081b27bac46c630cc3dfd93028b0 Mon Sep 17 00:00:00 2001
From: SoftCoder <mark_vejvoda@hotmail.com>
Date: Sat, 1 Feb 2014 11:25:01 -0800
Subject: [PATCH] - bugfix for streflop_test on windows

---
 source/tests/shared_lib/streflop/streflop_test.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/source/tests/shared_lib/streflop/streflop_test.cpp b/source/tests/shared_lib/streflop/streflop_test.cpp
index 67f658fd..4c41830f 100644
--- a/source/tests/shared_lib/streflop/streflop_test.cpp
+++ b/source/tests/shared_lib/streflop/streflop_test.cpp
@@ -10,6 +10,11 @@
 // ==============================================================
 
 #include <cppunit/extensions/HelperMacros.h>
+#ifdef WIN32
+  #include <winsock2.h>
+  #include <winsock.h>
+#endif
+
 #include "vec.h"
 #include "skill_type.h"
 #include <memory>
@@ -207,13 +212,13 @@ public:
 			height = truncateDecimal<float>(height,6);
 
 			if(cellLandUnitHeight >= 0 && cellLandUnitHeight > airHeight) {
-				height += (std::min((float)cellLandUnitHeight,standardAirHeight * 3) - airHeight);
+				height += (min((float)cellLandUnitHeight,standardAirHeight * 3) - airHeight);
 				height = truncateDecimal<float>(height,6);
 			}
 			else {
 				if(cellObjectHeight >= 0) {
 					if(cellObjectHeight > airHeight) {
-						height += (std::min((float)cellObjectHeight,standardAirHeight * 3) - airHeight);
+						height += (min((float)cellObjectHeight,standardAirHeight * 3) - airHeight);
 						height = truncateDecimal<float>(height,6);
 					}
 				}