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

2012-02-13 14:24:03 -08:00
parent e4ee58f3cb 6dd4b91b32
commit 9ce69a5f9f
1 changed files with 1 additions and 1 deletions
--- 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