generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am da8ea213: Merge "libc: <stdint.h>: Don\'t make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined."

Browse Source 
* commit 'da8ea213abb8bec08da37622179061630bd8e2f8':
  libc: <stdint.h>: Don't make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined.
This commit is contained in:
David 'Digit' Turner
2011-03-11 11:13:45 -08:00
committed by Android Git Automerger
parent b299039d06 da8ea213ab
commit 638608b11a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libc/include/stdint.h
View File

@@ -41,11 +41,6 @@
# define __STDINT_MACROS # define __STDINT_MACROS
#endif #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 #if !defined __STRICT_ANSI__ || __STDC_VERSION__ >= 199901L
# define __STDC_INT64__ # define __STDC_INT64__
#endif #endif
@@ -185,13 +180,14 @@ typedef uint64_t uint_fast64_t;
# define UINT_FAST64_MAX UINT64_MAX # define UINT_FAST64_MAX UINT64_MAX
#endif #endif
#define __INT64_C(c) c ## LL
#define __UINT64_C(c) c ## ULL
#ifdef __STDINT_MACROS #ifdef __STDINT_MACROS
# define __INT64_C(c) c ## LL
# define INT64_C(c) __INT64_C(c) # define INT64_C(c) __INT64_C(c)
# define INT_LEAST64_C(c) INT64_C(c) # define INT_LEAST64_C(c) INT64_C(c)
# define INT_FAST64_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 UINT64_C(c) __UINT64_C(c)
# define UINT_LEAST64_C(c) UINT64_C(c) # define UINT_LEAST64_C(c) UINT64_C(c)
# define UINT_FAST64_C(c) UINT64_C(c) # define UINT_FAST64_C(c) UINT64_C(c)