diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-04-28 15:21:50 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-04-28 15:21:50 +0000 |
| commit | c19459a92177fc8864b461e84d017a21c4006dc5 (patch) | |
| tree | fcf20ad0222de01ad3a955edb3b65b06724a3a15 /libc/sysdeps/generic/stdint.h | |
| parent | 8751114637bcc3caaf16a4216da0afb84456558a (diff) | |
Merge changes between r22663 and r22954 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22955 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/generic/stdint.h')
| -rw-r--r-- | libc/sysdeps/generic/stdint.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libc/sysdeps/generic/stdint.h b/libc/sysdeps/generic/stdint.h index 15f750807..94c3203c8 100644 --- a/libc/sysdeps/generic/stdint.h +++ b/libc/sysdeps/generic/stdint.h @@ -141,10 +141,6 @@ typedef unsigned long long int uintmax_t; #endif -/* The ISO C99 standard specifies that in C++ implementations these - macros should only be defined if explicitly requested. */ -#if !defined __cplusplus || defined __STDC_LIMIT_MACROS - # if __WORDSIZE == 64 # define __INT64_C(c) c ## L # define __UINT64_C(c) c ## UL @@ -278,13 +274,6 @@ typedef unsigned long long int uintmax_t; # define WINT_MIN (0u) # define WINT_MAX (4294967295u) -#endif /* C++ && limit macros */ - - -/* The ISO C99 standard specifies that in C++ implementations these - should only be defined if explicitly requested. */ -#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS - /* Signed. */ # define INT8_C(c) c # define INT16_C(c) c @@ -314,6 +303,4 @@ typedef unsigned long long int uintmax_t; # define UINTMAX_C(c) c ## ULL # endif -#endif /* C++ && constant macros */ - #endif /* stdint.h */ |