[Android] [PATCH 6/7] jni: Excluse ARM-only header

Edward Wang edward.c.wang at compdigitec.com
Tue Jul 17 22:35:19 CEST 2012


On 12-07-17 04:33 PM, Rafaël Carré <funman at videolan.org> wrote:
> Le 2012-07-15 22:27, Edward Wang a écrit :
>> ---
>>   vlc-android/jni/pthread-once.c |    4 ++++
>>   1 files changed, 4 insertions(+), 0 deletions(-)
>>
>> diff --git a/vlc-android/jni/pthread-once.c b/vlc-android/jni/pthread-once.c
>> index e256a10..c0c6675 100644
>> --- a/vlc-android/jni/pthread-once.c
>> +++ b/vlc-android/jni/pthread-once.c
>> @@ -29,7 +29,11 @@
>>   #include <pthread.h>
>>   #include <unistd.h>
>>   
>> +#if defined(__arm__)
>> +/* The file is ARM only, for now at least.
>> + * It contains only ARM features anyway */
>>   #include <machine/cpu-features.h>
>> +#endif
>>   
>>   /* Adapted from bionic_atomic_inline.h */
>>   static inline void ANDROID_MEMBAR_FULL(void) {
>>
> If it doesn't harm just include it unconditionally

It will not compile if I include it unconditionally, since it complains 
of a missing header (the file is not present in arch-x86/usr/include).

Regards,
         Edward Wang


More information about the Android mailing list