commit 632c07c09297324565fd7adeda7322f1fafb3a1a
author Jean-Baptiste Queru <jbq@google.com> Fri Jan 27 21:09:07 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 27 21:09:07 2012 -0800
tree 1d597901499ef4ee2c8f049ac31da9427e999000
parent 514126b2b59105427da8014a11fb1fc32e6a751c
parent cc12c74f7f65c571778989cd902eb5b9fa74fb11

am cc12c74f: am e8004445: Merge "Make sure __u64 is defined even for strict ansi or -std=c99"

* commit 'cc12c74f7f65c571778989cd902eb5b9fa74fb11':
  Make sure __u64 is defined even for strict ansi or -std=c99

libc/kernel/arch-arm/asm/types.h

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 __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