From f0b91dd739ede9b0ec56fc4639acb94137eea76c Mon Sep 17 00:00:00 2001
From: David <david@xagasoft.com>
Date: Wed, 24 Nov 2010 20:21:43 +0000
Subject: david - some mix of qt or mingw or something has a min and max macro
 that conflict with this file... #undefed them for now, figure out better
 solution later

---
 src/util.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/util.h b/src/util.h
index 4fe9eb5..803c49f 100644
--- a/src/util.h
+++ b/src/util.h
@@ -39,6 +39,11 @@ namespace Bu
 		b = tmp;
 	}
 
+#ifdef WIN32
+	#warning: removing min and max win32 macros because of compile conflict
+	#undef min
+	#undef max
+#endif
 	/**
 	 * Finds the lesser of the two objects, objects passed in must be
 	 * less-than-comparable.
@@ -90,7 +95,7 @@ namespace Bu
 	{
 		return b<a?a:b;
 	}
-	
+
 	/**
 	 * Given three objects this finds the one between the other two.
 	 *@param a A value to test.
-- 
cgit v1.2.3