diff options
| author | Nils Wallménius <nils@rockbox.org> | 2009-01-24 10:16:22 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2009-01-24 10:16:22 +0000 |
| commit | 259116cefc595b2ea99841dea9cf8a2c7999740a (patch) | |
| tree | 411f321f730fe9a8f7e5207b319faa18e3cffda9 /firmware | |
| parent | 9b2fdb7953512760bb004440e4e7ced6b4d7ec05 (diff) | |
| download | rockbox-259116cefc595b2ea99841dea9cf8a2c7999740a.zip rockbox-259116cefc595b2ea99841dea9cf8a2c7999740a.tar.gz rockbox-259116cefc595b2ea99841dea9cf8a2c7999740a.tar.bz2 rockbox-259116cefc595b2ea99841dea9cf8a2c7999740a.tar.xz | |
Accept FS#9717 by Akio Idehara with a small change suggested by Rafaël Carré avoiding simulator warnings about redefining endianness switching macros
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19843 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/export/system.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/firmware/export/system.h b/firmware/export/system.h index cc2a08d..fb9dfa3 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h @@ -121,6 +121,18 @@ int get_cpu_boost_counter(void); ptr = (typeof(ptr))tmp_ptr1; \ } +/* newer? SDL includes endian.h, So we ignore it */ +#ifdef SIMULATOR +#undef letoh16 +#undef letoh32 +#undef htole16 +#undef htole32 +#undef betoh16 +#undef betoh32 +#undef htobe16 +#undef htobe32 +#endif + /* live endianness conversion */ #ifdef ROCKBOX_LITTLE_ENDIAN #define letoh16(x) (x) |