diff options
| author | glx <glx@openttd.org> | 2008-05-08 20:05:32 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2008-05-08 20:05:32 +0000 |
| commit | 0b37b81956ff5548aed20c1260af3426ac99b291 (patch) | |
| tree | c53a6a3209fe783cbbe698c46e828b06fa870b11 /src/saveload.cpp | |
| parent | ba853fdb0b914ecf2764b1c465fe79546f0aa3df (diff) | |
| download | openttd-0b37b81956ff5548aed20c1260af3426ac99b291.tar.xz | |
(svn r13019) -Fix [FS#1997]: silence some more MSVC x64 warnings (michi_cc)
Diffstat (limited to 'src/saveload.cpp')
| -rw-r--r-- | src/saveload.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/saveload.cpp b/src/saveload.cpp index ff2c4b3fb..abca0db1d 100644 --- a/src/saveload.cpp +++ b/src/saveload.cpp @@ -531,7 +531,7 @@ static void SlSaveLoadConv(void *ptr, VarType conv) static inline size_t SlCalcNetStringLen(const char *ptr, size_t length) { if (ptr == NULL) return 0; - return minu(strlen(ptr), length - 1); + return min(strlen(ptr), length - 1); } /** Calculate the gross length of the string that it @@ -911,7 +911,7 @@ void SlAutolength(AutolengthProc *proc, void *arg) static void SlLoadChunk(const ChunkHandler *ch) { byte m = SlReadByte(); - size_t len; + uint32 len; uint32 endoffs; _sl.block_mode = m; @@ -1204,9 +1204,9 @@ static uint ReadZlib() _z.avail_out = 4096; do { - /* read more bytes from the file?*/ + /* read more bytes from the file? */ if (_z.avail_in == 0) { - _z.avail_in = fread(_z.next_in = _sl.buf + 4096, 1, 4096, _sl.fh); + _z.avail_in = (uint)fread(_z.next_in = _sl.buf + 4096, 1, 4096, _sl.fh); } /* inflate the data */ |