am 0b61567f: Merge "Fix the x86-64 int64_t/uint64_t."

* commit '0b61567f9fc5b54ffdb324bf21f8ca332b69a249':
  Fix the x86-64 int64_t/uint64_t.
This commit is contained in:
Elliott Hughes 2013-12-18 14:16:24 -08:00 committed by Android Git Automerger
commit 512ff2729a

View File

@ -62,10 +62,8 @@ typedef short __int16_t;
typedef unsigned short __uint16_t;
typedef int __int32_t;
typedef unsigned int __uint32_t;
/* LONGLONG */
typedef long long __int64_t;
/* LONGLONG */
typedef unsigned long long __uint64_t;
typedef long __int64_t;
typedef unsigned long __uint64_t;
/* 7.18.1.2 Minimum-width integer types */
typedef __int8_t __int_least8_t;