Merge "AArch64: Fix definitions for STDINT_LIMITS"

This commit is contained in:
Elliott Hughes 2013-10-22 19:41:26 +00:00 committed by Gerrit Code Review
commit f0ed9bf253

@ -193,17 +193,33 @@ typedef uint64_t uint_fast64_t;
# define __PRIFAST_RANK "" # define __PRIFAST_RANK ""
# define __PRIPTR_RANK "" # define __PRIPTR_RANK ""
/* /*
* intptr_t & uintptr_t * intptr_t & uintptr_t
*/ */
#ifdef __LP64__ #ifdef __LP64__
typedef long intptr_t; typedef long intptr_t;
typedef unsigned long uintptr_t; typedef unsigned long uintptr_t;
#ifdef __STDINT_LIMITS
# define INTPTR_MIN INT64_MIN
# define INTPTR_MAX INT64_MAX
# define UINTPTR_MAX UINT64_MAX
# define PTRDIFF_MIN INT64_MIN
# define PTRDIFF_MAX INT64_MAX
#endif
#ifdef __STDINT_MACROS
# define INTPTR_C(c) INT64_C(c)
# define UINTPTR_C(c) UINT64_C(c)
# define PTRDIFF_C(c) INT64_C(c)
#endif
#else #else
typedef int intptr_t; typedef int intptr_t;
typedef unsigned int uintptr_t; typedef unsigned int uintptr_t;
#endif
#ifdef __STDINT_LIMITS #ifdef __STDINT_LIMITS
# define INTPTR_MIN INT32_MIN # define INTPTR_MIN INT32_MIN
@ -212,13 +228,15 @@ typedef unsigned int uintptr_t;
# define PTRDIFF_MIN INT32_MIN # define PTRDIFF_MIN INT32_MIN
# define PTRDIFF_MAX INT32_MAX # define PTRDIFF_MAX INT32_MAX
#endif #endif
#ifdef __STDINT_MACROS #ifdef __STDINT_MACROS
# define INTPTR_C(c) INT32_C(c) # define INTPTR_C(c) INT32_C(c)
# define UINTPTR_C(c) UINT32_C(c) # define UINTPTR_C(c) UINT32_C(c)
# define PTRDIFF_C(c) INT32_C(c) # define PTRDIFF_C(c) INT32_C(c)
#endif #endif
#endif /* __LP64__ */
/* /*
* intmax_t & uintmax_t * intmax_t & uintmax_t
*/ */