# HG changeset patch # User glx # Date 2008-07-31 22:55:12 # Node ID 3ae775ddbb05e3cb2a7c4caf76d06ee38d7dd68e # Parent 3f3d8995f869ab39f0918fd95fb5e43c11425a37 (svn r13904) -Fix (r13715): 'cast from/to pointer to/from integer of different size' warnings diff --git a/src/strings.cpp b/src/strings.cpp --- a/src/strings.cpp +++ b/src/strings.cpp @@ -188,7 +188,7 @@ char *InlineString(char *buf, StringID s */ void SetDParamStr(uint n, const char *str) { - SetDParam(n, (uint64)str); + SetDParam(n, (uint64)(size_t)str); } void InjectDParam(int amount) @@ -297,7 +297,7 @@ static char *FormatTinyDate(char *buff, snprintf(day, lengthof(day), "%02i", ymd.day); snprintf(month, lengthof(month), "%02i", ymd.month + 1); - int64 args[3] = { (int64)day, (int64)month, ymd.year }; + int64 args[3] = { (int64)(size_t)day, (int64)(size_t)month, ymd.year }; return FormatString(buff, GetStringPtr(STR_DATE_TINY), args, 0, last); } @@ -556,7 +556,7 @@ static char* FormatString(char* buff, co break; case SCC_RAW_STRING_POINTER: { // {RAW_STRING} - const char *str = (const char*)GetInt64(&argv); + const char *str = (const char*)(size_t)GetInt64(&argv); buff = FormatString(buff, str, argv, casei, last); break; }