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

1 files changed, 6 insertions, 1 deletions

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.