1.1 --- a/core/logic/GameConfigs.cpp	Fri May 14 23:35:42 2010 -0700
     1.2 +++ b/core/logic/GameConfigs.cpp	Sat May 15 13:01:23 2010 -0700
     1.3 @@ -928,14 +928,14 @@
     1.4  	return true;
     1.5  }
     1.6  
     1.7 -static inline unsigned min(unsigned a, unsigned b)
     1.8 +static inline unsigned minOf(unsigned a, unsigned b)
     1.9  {
    1.10  	return a <= b ? a : b;
    1.11  }
    1.12  
    1.13  CGameConfig::AddressConf::AddressConf(char *sigName, unsigned sigLength, unsigned readCount, int *read)
    1.14  {
    1.15 -	unsigned readLimit = min(readCount, sizeof(this->read) / sizeof(this->read[0]));
    1.16 +	unsigned readLimit = minOf(readCount, sizeof(this->read) / sizeof(this->read[0]));
    1.17  
    1.18  	strncopy(signatureName, sigName, sizeof(signatureName) / sizeof(signatureName[0]));
    1.19  	this->readCount = readLimit;