diff options
| author | Neil Millstone | 2007-01-20 17:29:20 +0000 |
|---|---|---|
| committer | Neil Millstone | 2007-01-20 17:29:20 +0000 |
| commit | 0c82694f4782ad913b4d482f533f1e05f7219dc1 (patch) | |
| tree | 489b13fdf8a2c681beff44edda768b83f843f48e /backends/fs | |
| parent | b6b75af524e7446c961801b11abe170400335bdd (diff) | |
| download | scummvm-rg350-0c82694f4782ad913b4d482f533f1e05f7219dc1.tar.gz scummvm-rg350-0c82694f4782ad913b4d482f533f1e05f7219dc1.tar.bz2 scummvm-rg350-0c82694f4782ad913b4d482f533f1e05f7219dc1.zip | |
Ported changes from branch-0-9-0 to fix grabRawScreen(), and palette corruption.
svn-id: r25129
Diffstat (limited to 'backends/fs')
| -rw-r--r-- | backends/fs/ds/ds-fs.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/backends/fs/ds/ds-fs.h b/backends/fs/ds/ds-fs.h index 951d15799b..5b9bd84a0d 100644 --- a/backends/fs/ds/ds-fs.h +++ b/backends/fs/ds/ds-fs.h @@ -123,7 +123,8 @@ struct fileHandle { // // A #define is the only way, as redefinig the functions would cause linker errors. -// These functions need to be #undef'ed, as their definition is done with #includes +// These functions need to be #undef'ed, as their original definition +// in devkitarm is done with #includes (ugh!) #undef feof #undef stderr #undef stdout @@ -175,6 +176,11 @@ int std_ferror(FILE* handle); #define getcwd(dir, dunno) DS::std_getcwd(dir, dunno) #define ferror(handle) DS::std_ferror(handle) +#ifdef assert +#undef assert +#endif + +#define assert(s) if (!(s)) consolePrintf("Assertion failed: '##s##' at file %s, line %d\n", __FILE__, __LINE__) } |