diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-05-31 21:16:17 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-05-31 21:16:17 +0000 |
commit | 1aadfb2229d7105d19d321079acaede1e4f63a3f (patch) | |
tree | 97498c0746be5479642206b460a8ca4ac3851cdd /firmware/export | |
parent | 9d1c2869ef55b325c4c2434ec1e53fe764e87691 (diff) | |
download | rockbox-1aadfb2229d7105d19d321079acaede1e4f63a3f.tar.gz rockbox-1aadfb2229d7105d19d321079acaede1e4f63a3f.zip |
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
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/system.h | 6 |
1 files changed, 6 insertions, 0 deletions
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); | |||
137 | #undef htobe32 | 137 | #undef htobe32 |
138 | #endif | 138 | #endif |
139 | 139 | ||
140 | /* Android NDK contains swap16 and swap32, ignore them */ | ||
141 | #if (CONFIG_PLATFORM & PLATFORM_ANDROID) | ||
142 | #undef swap16 | ||
143 | #undef swap32 | ||
144 | #endif | ||
145 | |||
140 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(PLATFORM_HAS_VOLUME_CHANGE) | 146 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(PLATFORM_HAS_VOLUME_CHANGE) |
141 | int hosted_get_volume(void); | 147 | int hosted_get_volume(void); |
142 | #endif | 148 | #endif |