From 1aadfb2229d7105d19d321079acaede1e4f63a3f Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Tue, 31 May 2011 21:16:17 +0000 Subject: Android: ignore swap16 and swap32 from NDK. The NDK includes swap16 and swap32 macros, Rockbox as well. Use the Rockbox ones and avoid a macro redefined warning. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29939 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/system.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'firmware/export') diff --git a/firmware/export/system.h b/firmware/export/system.h index 3f626c3688..b85b09ea70 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h @@ -137,6 +137,12 @@ int get_cpu_boost_counter(void); #undef htobe32 #endif +/* Android NDK contains swap16 and swap32, ignore them */ +#if (CONFIG_PLATFORM & PLATFORM_ANDROID) +#undef swap16 +#undef swap32 +#endif + #if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(PLATFORM_HAS_VOLUME_CHANGE) int hosted_get_volume(void); #endif -- cgit v1.2.3