diff -r 8ea042c00c80 -r 1200cff67720 core/logic/GameConfigs.cpp
--- a/core/logic/GameConfigs.cpp	Fri May 14 23:35:42 2010 -0700
+++ b/core/logic/GameConfigs.cpp	Sat May 15 13:01:23 2010 -0700
@@ -928,14 +928,14 @@
 	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;