From 259116cefc595b2ea99841dea9cf8a2c7999740a Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Sat, 24 Jan 2009 10:16:22 +0000 Subject: Accept FS#9717 by Akio Idehara with a small change suggested by Rafaël Carré avoiding simulator warnings about redefining endianness switching macros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19843 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/system.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'firmware/export') diff --git a/firmware/export/system.h b/firmware/export/system.h index cc2a08db2e..fb9dfa3003 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) -- cgit v1.2.3