Mercurial > hg > openttd

changeset 12040:9307fef56ed0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r16447) -Fix [FS#2922] (r16444): compiling on x86-64 failed
author yexo <yexo@openttd.org>
date Wed, 27 May 2009 00:46:17 +0000
parents f97380480f7d
children f42528b31062
files src/settings.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -439,7 +439,7 @@
 		case SDT_NUMX:
 		case SDT_ONEOFMANY:
 		case SDT_MANYOFMANY:
-			Write_ValidateSetting(ptr, sd, (unsigned long)p); break;
+			Write_ValidateSetting(ptr, sd, (size_t)p); break;
 
 		case SDT_STRING:
 			switch (GetVarMemType(sld->conv)) {
@@ -1516,7 +1516,7 @@
 	const SettingDesc *sd;
 	for (sd = _company_settings; sd->save.cmd != SL_END; sd++) {
 		void *var = GetVariableAddress(&c->settings, &sd->save);
-		Write_ValidateSetting(var, sd, (int32)sd->desc.def);
+		Write_ValidateSetting(var, sd, (size_t)sd->desc.def);
 	}
 }