From 6dd4b91b326b0c385d9c68c90a255d6db799757e Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Fri, 27 Jan 2012 17:54:02 +0200 Subject: [PATCH] Make sure __u64 is defined even for strict ansi or -std=c99 The x86 asm headers define __u64 regardless of __STRICT_ANSI__. The linux/videodev2.h header requires __u64 to be defined, thus this fixes compiling with -std=c99 when including the linux/videodev2.h header. In glibc, the asm/types.h header defines __u64 regardless of __STRICT_ANSI__. This commit copies the updated header from bionic into the ndk platform headers. --- ndk/platforms/android-3/arch-arm/include/asm/types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ndk/platforms/android-3/arch-arm/include/asm/types.h b/ndk/platforms/android-3/arch-arm/include/asm/types.h index ec60f100c..80cea8de4 100644 --- a/ndk/platforms/android-3/arch-arm/include/asm/types.h +++ b/ndk/platforms/android-3/arch-arm/include/asm/types.h @@ -25,7 +25,7 @@ typedef unsigned short __u16; typedef __signed__ int __s32; typedef unsigned int __u32; -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) +#ifdef __GNUC__ typedef __signed__ long long __s64; typedef unsigned long long __u64; #endif