diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-03-11 11:13:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-11 11:13:45 -0800 |
| commit | 638608b11afbd255ddbd15e739f0f638791a4305 (patch) | |
| tree | f77e9884ea8974fcbc29b0381eeb1523fecaf89c /libc | |
| parent | b299039d060eb5f523c05e4f9b6934a6b897a54f (diff) | |
| parent | da8ea213abb8bec08da37622179061630bd8e2f8 (diff) | |
| download | bionic-638608b11afbd255ddbd15e739f0f638791a4305.zip bionic-638608b11afbd255ddbd15e739f0f638791a4305.tar.gz bionic-638608b11afbd255ddbd15e739f0f638791a4305.tar.bz2 | |
am da8ea213: Merge "libc: <stdint.h>: Don\'t make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined."
* commit 'da8ea213abb8bec08da37622179061630bd8e2f8':
libc: <stdint.h>: Don't make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined.
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/include/stdint.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libc/include/stdint.h b/libc/include/stdint.h index 3cd09d4..e791475 100644 --- a/libc/include/stdint.h +++ b/libc/include/stdint.h @@ -41,11 +41,6 @@ # define __STDINT_MACROS #endif -/* the definitions of STDINT_LIMITS depend on those of STDINT_MACROS */ -#if defined __STDINT_LIMITS && !defined __STDINT_MACROS -# define __STDINT_MACROS -#endif - #if !defined __STRICT_ANSI__ || __STDC_VERSION__ >= 199901L # define __STDC_INT64__ #endif @@ -185,13 +180,14 @@ typedef uint64_t uint_fast64_t; # define UINT_FAST64_MAX UINT64_MAX #endif +#define __INT64_C(c) c ## LL +#define __UINT64_C(c) c ## ULL + #ifdef __STDINT_MACROS -# define __INT64_C(c) c ## LL # define INT64_C(c) __INT64_C(c) # define INT_LEAST64_C(c) INT64_C(c) # define INT_FAST64_C(c) INT64_C(c) -# define __UINT64_C(c) c ## ULL # define UINT64_C(c) __UINT64_C(c) # define UINT_LEAST64_C(c) UINT64_C(c) # define UINT_FAST64_C(c) UINT64_C(c) |