Fixed windows build.

This commit is contained in:
David Anderson 2010-05-15 13:01:23 -07:00
parent 64455b9852
commit 60226d9195

View File

@ -928,14 +928,14 @@ bool CGameConfig::GetAddress(const char *key, void **retaddr)
return true;
}
static inline unsigned min(unsigned a, unsigned b)
static inline unsigned minOf(unsigned a, unsigned b)
{
return a <= b ? a : b;
}
CGameConfig::AddressConf::AddressConf(char *sigName, unsigned sigLength, unsigned readCount, int *read)
{
unsigned readLimit = min(readCount, sizeof(this->read) / sizeof(this->read[0]));
unsigned readLimit = minOf(readCount, sizeof(this->read) / sizeof(this->read[0]));
strncopy(signatureName, sigName, sizeof(signatureName) / sizeof(signatureName[0]));
this->readCount = readLimit;