diff options
| author | Robin Watts | 2008-11-29 18:01:16 +0000 |
|---|---|---|
| committer | Robin Watts | 2008-11-29 18:01:16 +0000 |
| commit | 8f3b2e9b4d9f1f82682e1eed018153091cddee9f (patch) | |
| tree | f2af64fa467e70a3ba25e9c615baa053e0818d88 /backends/fs | |
| parent | 362bdf87d78f611f3e308e7e9234831208b93d68 (diff) | |
| download | scummvm-rg350-8f3b2e9b4d9f1f82682e1eed018153091cddee9f.tar.gz scummvm-rg350-8f3b2e9b4d9f1f82682e1eed018153091cddee9f.tar.bz2 scummvm-rg350-8f3b2e9b4d9f1f82682e1eed018153091cddee9f.zip | |
Remove warnings from NDS build.
svn-id: r35172
Diffstat (limited to 'backends/fs')
| -rw-r--r-- | backends/fs/ds/ds-fs.cpp | 2 | ||||
| -rw-r--r-- | backends/fs/stdiostream.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp index dda176bbcc..c0692c0713 100644 --- a/backends/fs/ds/ds-fs.cpp +++ b/backends/fs/ds/ds-fs.cpp @@ -588,7 +588,7 @@ size_t std_fread(const void* ptr, size_t size, size_t numItems, FILE* handle) { return bytes / size; } - if ((size_t)(handle->pos + size * numItems) > handle->size) { + if ((int)(handle->pos + size * numItems) > handle->size) { numItems = (handle->size - handle->pos) / size; if (numItems < 0) numItems = 0; } diff --git a/backends/fs/stdiostream.cpp b/backends/fs/stdiostream.cpp index 3b0de253ab..d0592c8e50 100644 --- a/backends/fs/stdiostream.cpp +++ b/backends/fs/stdiostream.cpp @@ -85,6 +85,7 @@ #define fseek(handle, offset, whence) DS::std_fseek(handle, offset, whence) #define clearerr(handle) DS::std_clearerr(handle) #define fflush(file) DS::std_fflush(file) + #undef ferror #define ferror(handle) DS::std_ferror(handle) #endif |