tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 0b73dac8: am d6722bdd: Merge "libc: <stdint.h>: Proper C++"

Browse source 
* commit '0b73dac8aa9546c0f532c7ea5e0bf72dd029f271':
  libc: <stdint.h>: Proper C++
This commit is contained in:
David 'Digit' Turner 2011-03-11 15:40:16 -08:00 committed by Android Git Automerger
commit b868a32df6
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
libc/include/stdint.h
View file

@ -211,14 +211,20 @@ typedef uint64_t uint_fast64_t;
typedef int intptr_t; typedef int intptr_t;
typedef unsigned int uintptr_t; typedef unsigned int uintptr_t;
#ifdef __STDINT_LIMITS
# define INTPTR_MIN INT32_MIN # define INTPTR_MIN INT32_MIN
# define INTPTR_MAX INT32_MAX # define INTPTR_MAX INT32_MAX
# define UINTPTR_MAX UINT32_MAX # define UINTPTR_MAX UINT32_MAX
# define PTRDIFF_MIN INT32_MIN
# define PTRDIFF_MAX INT32_MAX
#endif
#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)
# define PTRDIFF_MIN INT32_MIN #endif
# define PTRDIFF_MAX INT32_MAX
/* /*
@ -230,24 +236,32 @@ typedef unsigned int uintptr_t;
typedef uint64_t uintmax_t; typedef uint64_t uintmax_t;
typedef int64_t intmax_t; typedef int64_t intmax_t;
#define INTMAX_MIN INT64_MIN #ifdef __STDINT_LIMITS
#define INTMAX_MAX INT64_MAX # define INTMAX_MIN INT64_MIN
#define UINTMAX_MAX UINT64_MAX # define INTMAX_MAX INT64_MAX
# define UINTMAX_MAX UINT64_MAX
#endif
#define INTMAX_C(c) INT64_C(c) #ifndef __STDINT_MACROS
#define UINTMAX_C(c) UINT64_C(c) # define INTMAX_C(c) INT64_C(c)
# define UINTMAX_C(c) UINT64_C(c)
#endif
#else /* !__STDC_INT64__ */ #else /* !__STDC_INT64__ */
typedef uint32_t uintmax_t; typedef uint32_t uintmax_t;
typedef int32_t intmax_t; typedef int32_t intmax_t;
#define INTMAX_MIN INT32_MIN #ifdef __STDINT_LIMITS
#define INTMAX_MAX INT32_MAX # define INTMAX_MIN INT32_MIN
#define UINTMAX_MAX UINT32_MAX # define INTMAX_MAX INT32_MAX
# define UINTMAX_MAX UINT32_MAX
#endif
#define INTMAX_C(c) INT32_C(c) #ifdef __STDINT_MACROS
#define UINTMAX_C(c) UINT32_C(c) # define INTMAX_C(c) INT32_C(c)
# define UINTMAX_C(c) UINT32_C(c)
#endif
#endif /* !__STDC_INT64__ */ #endif /* !__STDC_INT64__ */