From 60226d91956b0a7061a3625a21e28a9484b96281 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Sat, 15 May 2010 13:01:23 -0700
Subject: [PATCH] Fixed windows build.

---
 core/logic/GameConfigs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/logic/GameConfigs.cpp b/core/logic/GameConfigs.cpp
index e3b129a3..2c79649d 100644
--- a/core/logic/GameConfigs.cpp
+++ b/core/logic/GameConfigs.cpp
@@ -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;