[Box Backup-commit] COMMIT r1208 - box/trunk/bin/bbackupquery

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Thu, 14 Dec 2006 23:06:33 +0000


Author: chris
Date: 2006-12-14 23:06:33 +0000 (Thu, 14 Dec 2006)
New Revision: 1208

Modified:
   box/trunk/bin/bbackupquery/BackupQueries.cpp
Log:
Fix compile error caused by conflicting MSVC macros (merges [1035])


Modified: box/trunk/bin/bbackupquery/BackupQueries.cpp
===================================================================
--- box/trunk/bin/bbackupquery/BackupQueries.cpp	2006-12-14 23:04:00 UTC (rev 1207)
+++ box/trunk/bin/bbackupquery/BackupQueries.cpp	2006-12-14 23:06:33 UTC (rev 1208)
@@ -49,6 +49,10 @@
 
 #include "MemLeakFindOn.h"
 
+// min() and max() macros from stdlib.h break numeric_limits<>::min(), etc.
+#undef min
+#undef max
+
 #define COMPARE_RETURN_SAME			1
 #define COMPARE_RETURN_DIFFERENT	2
 #define COMPARE_RETURN_ERROR		3