summaryrefslogtreecommitdiffstats
path: root/libc/kernel
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2012-01-25 23:25:09 +0200
committerMartin Storsjo <martin@martin.st>2012-01-25 23:41:19 +0200
commit738b175a932e9eba424750926e753f2227b4d1bc (patch)
treeb26540e615e53db53c8072488cba838825c957b8 /libc/kernel
parente22dfc46b763e9b0c6300b7068609d2db60a9b2c (diff)
downloadbionic-738b175a932e9eba424750926e753f2227b4d1bc.zip
bionic-738b175a932e9eba424750926e753f2227b4d1bc.tar.gz
bionic-738b175a932e9eba424750926e753f2227b4d1bc.tar.bz2
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 is the change for the generated arch-arm/asm/types.h header, as produced by the update_all.py script (without all the other unrelated changes that the script produces). FWIW, the same issue also is present in arch-sh/asm/types.h, but there are no source headers for arch-sh in external/kernel-headers (and regenerating the headers simply removes that file). Change-Id: If05fcc9ed6ff5943602be121c7be140116e361fe
Diffstat (limited to 'libc/kernel')
-rw-r--r--libc/kernel/arch-arm/asm/types.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/kernel/arch-arm/asm/types.h b/libc/kernel/arch-arm/asm/types.h
index ec60f10..80cea8d 100644
--- a/libc/kernel/arch-arm/asm/types.h
+++ b/libc/kernel/arch-arm/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