diff options
| author | Marcin Bukat <marcin.bukat@gmail.com> | 2012-10-18 13:40:08 +0200 |
|---|---|---|
| committer | Marcin Bukat <marcin.bukat@gmail.com> | 2012-10-18 13:40:08 +0200 |
| commit | 41b6ac6afb1f8bff0fb7b11ff3b3e406c05e0bf3 (patch) | |
| tree | c87291ad46e78d2561c3b23ce4b86c1bdabe154f | |
| parent | 04fb4b77ac6badc53256c69475ff131eb24edc83 (diff) | |
| download | rockbox-41b6ac6afb1f8bff0fb7b11ff3b3e406c05e0bf3.tar.gz rockbox-41b6ac6afb1f8bff0fb7b11ff3b3e406c05e0bf3.zip | |
libgme: fix badly written cpp conditions spotted by gcc 4.6.3
Change-Id: Ia3fba4ba2c46a202c48f3a9b7db0cba9f75b6a50
| -rw-r--r-- | lib/rbcodec/codecs/libgme/gb_cpu_run.h | 2 | ||||
| -rw-r--r-- | lib/rbcodec/codecs/libgme/z80_cpu_run.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/rbcodec/codecs/libgme/gb_cpu_run.h b/lib/rbcodec/codecs/libgme/gb_cpu_run.h index 1ea8b59249..acfd515ca3 100644 --- a/lib/rbcodec/codecs/libgme/gb_cpu_run.h +++ b/lib/rbcodec/codecs/libgme/gb_cpu_run.h | |||
| @@ -129,7 +129,7 @@ int const c10 = 0x10; // cz | |||
| 129 | 129 | ||
| 130 | #ifdef BLARGG_BIG_ENDIAN | 130 | #ifdef BLARGG_BIG_ENDIAN |
| 131 | #define R8( n ) (reg.r8_ [n]) | 131 | #define R8( n ) (reg.r8_ [n]) |
| 132 | #elif BLARGG_LITTLE_ENDIAN | 132 | #elif defined(BLARGG_LITTLE_ENDIAN) |
| 133 | #define R8( n ) (reg.r8_ [(n) ^ 1]) | 133 | #define R8( n ) (reg.r8_ [(n) ^ 1]) |
| 134 | #else | 134 | #else |
| 135 | // Be sure "blargg_endian.h" has been #included in the file that #includes this | 135 | // Be sure "blargg_endian.h" has been #included in the file that #includes this |
diff --git a/lib/rbcodec/codecs/libgme/z80_cpu_run.h b/lib/rbcodec/codecs/libgme/z80_cpu_run.h index a453487bb0..26c2a1a7b6 100644 --- a/lib/rbcodec/codecs/libgme/z80_cpu_run.h +++ b/lib/rbcodec/codecs/libgme/z80_cpu_run.h | |||
| @@ -131,7 +131,7 @@ int const C01 = 0x01; | |||
| 131 | 131 | ||
| 132 | #ifdef BLARGG_BIG_ENDIAN | 132 | #ifdef BLARGG_BIG_ENDIAN |
| 133 | #define R8( n, offset ) ((r.r8_ - offset) [n]) | 133 | #define R8( n, offset ) ((r.r8_ - offset) [n]) |
| 134 | #elif BLARGG_LITTLE_ENDIAN | 134 | #elif defined(BLARGG_LITTLE_ENDIAN) |
| 135 | #define R8( n, offset ) ((r.r8_ - offset) [(n) ^ 1]) | 135 | #define R8( n, offset ) ((r.r8_ - offset) [(n) ^ 1]) |
| 136 | #else | 136 | #else |
| 137 | #error "Byte order of CPU must be known" | 137 | #error "Byte order of CPU must be known" |