(svn r8055) -Codechange: Replace the different max, dmax, maxu whatever macros by a simple template function max(), that requires two arguments of the same type. While I'm at it change a variable called "max" to "maxval" in a function that calls max().

src/economy.cpp

@@ -85,7 +85,7 @@ int64 CalculateCompanyValue(const Player* p)
 
 	value += p->money64 - p->current_loan; // add real money value
 
-	return max64(value, 1);
+	return max(value, 1LL);
 }
 
 // if update is set to true, the economy is updated with this score