From 80736a1bcabd58c43bb4519699803b697381a773 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Tue, 28 Dec 2010 21:47:03 +0100 Subject: [PATCH] Use __asm__ instead of asm in public libc headers If compiling userland code with -std=c99, the current header produces an error. The content of this header originally is a kernel internal header, where asm() is acceptable. In a header visible to userland, this should be __asm__ instead. This change is done for all newly extracted headers by the extraction script, by https://review.source.android.com/19406, which was recently merged. Change-Id: I69332124a56577673a14e84cd7d9a4462c307724 --- ndk/platforms/android-3/arch-arm/include/asm/byteorder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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));