diff options
author | Max Horn | 2010-07-05 16:12:31 +0000 |
---|---|---|
committer | Max Horn | 2010-07-05 16:12:31 +0000 |
commit | 75529dc4022ec52ffba971d532c397aa951c2d5c (patch) | |
tree | bbc192b2c92788843f096b7d5dce8da650925d50 /backends/fs/ds/ds-fs.h | |
parent | edb5210d382d27c31cca0a48a427735044078ba4 (diff) | |
download | scummvm-rg350-75529dc4022ec52ffba971d532c397aa951c2d5c.tar.gz scummvm-rg350-75529dc4022ec52ffba971d532c397aa951c2d5c.tar.bz2 scummvm-rg350-75529dc4022ec52ffba971d532c397aa951c2d5c.zip |
DS: Fix various warnings and errors in the DS FS code
* Do not modify the strings passed to std_fopen anymore
* Correct signature of std_fread
* Do not cast away constness, nor perform unnecessary casts
svn-id: r50693
Diffstat (limited to 'backends/fs/ds/ds-fs.h')
-rw-r--r-- | backends/fs/ds/ds-fs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/fs/ds/ds-fs.h b/backends/fs/ds/ds-fs.h index b1df3a98eb..ee4afe60f3 100644 --- a/backends/fs/ds/ds-fs.h +++ b/backends/fs/ds/ds-fs.h @@ -209,16 +209,16 @@ public: #undef stdout #undef stdin -#define stdout ((DS::fileHandle*) -1) -#define stderr ((DS::fileHandle*) -2) -#define stdin ((DS::fileHandle*) -3) +#define stdout ((DS::fileHandle *) -1) +#define stderr ((DS::fileHandle *) -2) +#define stdin ((DS::fileHandle *) -3) #define FILE DS::fileHandle // Please do not remove any of these prototypes that appear not to be required. FILE* std_fopen(const char *name, const char *mode); void std_fclose(FILE *handle); -size_t std_fread(const void *ptr, size_t size, size_t numItems, FILE *handle); +size_t std_fread(void *ptr, size_t size, size_t numItems, FILE *handle); size_t std_fwrite(const void *ptr, size_t size, size_t numItems, FILE *handle); bool std_feof(FILE *handle); long int std_ftell(FILE *handle); |