[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rockbox-cvs
Subject:    bluebrother: r29939 - trunk/firmware/export
From:       mailer () svn ! rockbox ! org
Date:       2011-05-31 21:16:17
Message-ID: 201105312116.p4VLGHrC030674 () giant ! haxx ! se
[Download RAW message or body]

Date: 2011-05-31 23:16:17 +0200 (Tue, 31 May 2011)
New Revision: 29939

Log Message:
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.

Modified:
   trunk/firmware/export/system.h

Modified: trunk/firmware/export/system.h
===================================================================
--- trunk/firmware/export/system.h	2011-05-31 21:08:29 UTC (rev 29938)
+++ trunk/firmware/export/system.h	2011-05-31 21:16:17 UTC (rev 29939)
@@ -137,6 +137,12 @@
 #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

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs@cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs
[prev in list] [next in list] [prev in thread] [next in thread]