diff options
| -rw-r--r-- | lib/Headers/stdint.h | 4 | ||||
| -rw-r--r-- | test/Preprocessor/stdint.c | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lib/Headers/stdint.h b/lib/Headers/stdint.h index 2b89fa43f3..77f0e86e04 100644 --- a/lib/Headers/stdint.h +++ b/lib/Headers/stdint.h @@ -655,8 +655,8 @@ typedef __stdint_exjoin3(uint, __INTMAX_WIDTH__, _t) uintmax_t; #endif /* 7.18.4.2 Macros for greatest-width integer constants. */ -#define INTMAX_C(v) v##LL -#define UINTMAX_C(v) v##ULL +#define INTMAX_C(v) __stdint_exjoin3( INT, __INTMAX_WIDTH__, _C(v)) +#define UINTMAX_C(v) __stdint_exjoin3(UINT, __INTMAX_WIDTH__, _C(v)) #endif /* __STDC_HOSTED__ */ #endif /* __CLANG_STDINT_H */ diff --git a/test/Preprocessor/stdint.c b/test/Preprocessor/stdint.c index 9652319cc1..0f7fceaf6b 100644 --- a/test/Preprocessor/stdint.c +++ b/test/Preprocessor/stdint.c @@ -418,8 +418,8 @@ // MSP430:INT64_C_(0) INT64_C(0) // MSP430:UINT64_C_(0) UINT64_C(0) // -// MSP430:INTMAX_C_(0) 0LL -// MSP430:UINTMAX_C_(0) 0ULL +// MSP430:INTMAX_C_(0) 0L +// MSP430:UINTMAX_C_(0) 0UL // // RUN: clang-cc -E -ffreestanding -triple=pic16-none-none %s | FileCheck -check-prefix PIC16 %s // @@ -518,8 +518,8 @@ // PIC16:INT64_C_(0) INT64_C(0) // PIC16:UINT64_C_(0) UINT64_C(0) // -// PIC16:INTMAX_C_(0) 0LL -// PIC16:UINTMAX_C_(0) 0ULL +// PIC16:INTMAX_C_(0) 0L +// PIC16:UINTMAX_C_(0) 0UL // // RUN: clang-cc -E -ffreestanding -triple=powerpc64-none-none %s | FileCheck -check-prefix PPC64 %s // @@ -625,8 +625,8 @@ // PPC64:INT64_C_(0) 0L // PPC64:UINT64_C_(0) 0UL // -// PPC64:INTMAX_C_(0) 0LL -// PPC64:UINTMAX_C_(0) 0ULL +// PPC64:INTMAX_C_(0) 0L +// PPC64:UINTMAX_C_(0) 0UL // // RUN: clang-cc -E -ffreestanding -triple=powerpc-none-none %s | FileCheck -check-prefix PPC %s // @@ -840,8 +840,8 @@ // S390X:INT64_C_(0) 0L // S390X:UINT64_C_(0) 0UL // -// S390X:INTMAX_C_(0) 0LL -// S390X:UINTMAX_C_(0) 0ULL +// S390X:INTMAX_C_(0) 0L +// S390X:UINTMAX_C_(0) 0UL // // RUN: clang-cc -E -ffreestanding -triple=sparc-none-none %s | FileCheck -check-prefix SPARC %s // @@ -1047,8 +1047,8 @@ // TCE:INT64_C_(0) INT64_C(0) // TCE:UINT64_C_(0) UINT64_C(0) // -// TCE:INTMAX_C_(0) 0LL -// TCE:UINTMAX_C_(0) 0ULL +// TCE:INTMAX_C_(0) 0 +// TCE:UINTMAX_C_(0) 0U // // RUN: clang-cc -E -ffreestanding -triple=x86_64-none-none %s | FileCheck -check-prefix X86_64 %s // @@ -1155,8 +1155,8 @@ // X86_64:INT64_C_(0) 0L // X86_64:UINT64_C_(0) 0UL // -// X86_64:INTMAX_C_(0) 0LL -// X86_64:UINTMAX_C_(0) 0ULL +// X86_64:INTMAX_C_(0) 0L +// X86_64:UINTMAX_C_(0) 0UL // #include <stdint.h> |