From bfe20321e7d3e8fff8c48a0d8b4cb629d0a786ae Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 23 Jun 2009 20:29:59 +0000 Subject: [PATCH] (svn r16635) -Fix: a couple of MSVC 64 bits warnings --- src/settings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings.cpp b/src/settings.cpp index c64b8a7064..fde35834e8 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -440,7 +440,7 @@ static void ini_load_settings(IniFile *ini, const SettingDesc *sd, const char *g case SDT_NUMX: case SDT_ONEOFMANY: case SDT_MANYOFMANY: - Write_ValidateSetting(ptr, sd, (size_t)p); break; + Write_ValidateSetting(ptr, sd, (int32)(size_t)p); break; case SDT_STRING: switch (GetVarMemType(sld->conv)) { @@ -1520,7 +1520,7 @@ void SetDefaultCompanySettings(CompanyID cid) const SettingDesc *sd; for (sd = _company_settings; sd->save.cmd != SL_END; sd++) { void *var = GetVariableAddress(&c->settings, &sd->save); - Write_ValidateSetting(var, sd, (size_t)sd->desc.def); + Write_ValidateSetting(var, sd, (int32)(size_t)sd->desc.def); } }