diff options
| author | Elliott Hughes <enh@google.com> | 2024-02-08 00:32:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-08 00:32:53 +0000 |
| commit | 47931770b2f183487a85b4c0d0b7c8d805f0a907 (patch) | |
| tree | 7496d7dcae379d449e6b5d18d66ef20db2275f40 | |
| parent | 9f4fc27b07367688472f0040a667a788a9fa9be6 (diff) | |
| parent | ce42303468918c52c468405e3db8f0c8e49807c2 (diff) | |
| download | x86_64-linux-glibc2.17-4.8-47931770b2f183487a85b4c0d0b7c8d805f0a907.tar.gz | |
Merge "stdint.h: remove __STDC_CONSTANT_MACROS and __STDC_LIMIT_MACROS checks." into main am: ce42303468
Original change: https://android-review.googlesource.com/c/platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8/+/2955170
Change-Id: I1676e61d1fcaaf46fc3db7fecaa8364bfac51e4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | sysroot/usr/include/stdint.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sysroot/usr/include/stdint.h b/sysroot/usr/include/stdint.h index c7847ea..7965752 100644 --- a/sysroot/usr/include/stdint.h +++ b/sysroot/usr/include/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 */ |