summaryrefslogtreecommitdiffstats
path: root/ndk
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2011-01-05 23:08:29 +0100
committerDavid 'Digit' Turner <digit@google.com>2011-01-05 23:08:29 +0100
commitcbc7f6954872e85c8cf1c6af7e02d0cf471cc1a8 (patch)
tree09cc9d7f41a0c95b0f407c07086703e90d9499f3 /ndk
parent9efea49e40f3e3784cfa1c9fd67a6ca9ff5270e7 (diff)
downloadandroid_development-cbc7f6954872e85c8cf1c6af7e02d0cf471cc1a8.tar.gz
android_development-cbc7f6954872e85c8cf1c6af7e02d0cf471cc1a8.tar.bz2
android_development-cbc7f6954872e85c8cf1c6af7e02d0cf471cc1a8.zip
ndk: Replace 'asm' with '__asm__' in <asm/byteorder.h>
See https://review.source.android.com/#change,20076 for details. Essentially this is to allow compilation with -std=c99 Change-Id: I4c830c38b2615352765ee40773c5aa701e5d2b68
Diffstat (limited to 'ndk')
-rw-r--r--ndk/platforms/android-3/arch-arm/include/asm/byteorder.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ndk/platforms/android-3/arch-arm/include/asm/byteorder.h b/ndk/platforms/android-3/arch-arm/include/asm/byteorder.h
index 4da37bf8e..b8696959c 100644
--- a/ndk/platforms/android-3/arch-arm/include/asm/byteorder.h
+++ b/ndk/platforms/android-3/arch-arm/include/asm/byteorder.h
@@ -22,7 +22,7 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
#ifndef __thumb__
if (!__builtin_constant_p(x)) {
- asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
+ __asm__ ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
} else
#endif
t = x ^ ((x << 16) | (x >> 16));