summaryrefslogtreecommitdiff
path: root/src/settings.cpp
diff options
context:
space:
mode:
authorcelestar <celestar@openttd.org>2007-01-11 11:05:01 +0000
committercelestar <celestar@openttd.org>2007-01-11 11:05:01 +0000
commit2ac0410767683fb0e6315433f9805712cb85f5bd (patch)
treef9cb6bcd0d0b855706d1e00e0a4ffd2757c7e039 /src/settings.cpp
parent7996c9e560f61cddba0a3ad48b95c81d9030ef99 (diff)
downloadopenttd-2ac0410767683fb0e6315433f9805712cb85f5bd.tar.xz
(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().
Diffstat (limited to 'src/settings.cpp')
-rw-r--r--src/settings.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings.cpp b/src/settings.cpp
index 447f87d13..e6dd5514f 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -234,7 +234,7 @@ static IniFile *ini_load(const char *filename)
uint pos;
// add to comment
if (ns > a) {
- a = max(a, 128);
+ a = max(a, 128U);
do a*=2; while (a < ns);
ReallocT(&comment, comment_alloc = a);
}