1.1 --- a/extensions/tf2/conditions.cpp	Mon Aug 12 01:18:01 2013 +0100
     1.2 +++ b/extensions/tf2/conditions.cpp	Mon Aug 12 01:32:44 2013 +0100
     1.3 @@ -108,7 +108,7 @@
     1.4  		uint64_t j;
     1.5  		uint64_t bit;
     1.6  
     1.7 -		uint64_t maxbit = max(addedconds.lower, addedconds.upper);
     1.8 +		uint64_t maxbit = MAX(addedconds.lower, addedconds.upper);
     1.9  		for (j = 0; j < MAX_CONDS && (bit = ((uint64_t)1 << j)) <= maxbit; j++)
    1.10  		{
    1.11  			if ((addedconds.lower & bit) == bit)
    1.12 @@ -125,7 +125,7 @@
    1.13  			}
    1.14  		}
    1.15  
    1.16 -		maxbit = max(removedconds.lower, removedconds.upper);
    1.17 +		maxbit = MAX(removedconds.lower, removedconds.upper);
    1.18  		for (j = 0; j < MAX_CONDS && (bit = ((uint64_t)1 << j)) <= maxbit; j++)
    1.19  		{
    1.20  			if ((removedconds.lower & bit) == bit)