commit cc12c74f7f65c571778989cd902eb5b9fa74fb11
author Jean-Baptiste Queru <jbq@google.com> Fri Jan 27 07:41:43 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 27 07:41:43 2012 -0800
tree 5be793e1708bb0eed1e08a632af3f34f0367433e
parent 482d59a42f6c81e3a142ffbf23c67a903836f203
parent e80044455961005ac95e405c8d553f2418d8e50c

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

* commit 'e80044455961005ac95e405c8d553f2418d8e50c':
  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