nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Dominik Riebeling 2011-05-31 21:16:17 +00:00
parent 9d1c2869ef
commit 1aadfb2229
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/export/system.h
View File

@ -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