From 5b8e932d70fcf281e193aebfd0d3ac55d057f2da Mon Sep 17 00:00:00 2001 From: JF Bastien Date: Mon, 28 Oct 2013 08:58:05 -0700 Subject: Cherry-pick upstream clang r193506: "Define [U]LLONG_{MIN,MAX} for C++11, add tests." This is needed for libc++ testing with newlib. R=dschuff@chromium.org BUG= https://code.google.com/p/nativeclient/issues/detail?id=3623 TEST= ./pnacl/scripts/llvm-test.py --libcxx-tests Review URL: https://codereview.chromium.org/47573003 --- lib/Headers/limits.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/Headers/limits.h b/lib/Headers/limits.h index ecd09a4a24..91bd404650 100644 --- a/lib/Headers/limits.h +++ b/lib/Headers/limits.h @@ -87,8 +87,10 @@ #define CHAR_MAX __SCHAR_MAX__ #endif -/* C99 5.2.4.2.1: Added long long. */ -#if __STDC_VERSION__ >= 199901 +/* C99 5.2.4.2.1: Added long long. + C++11 18.3.3.2: same contents as the Standard C Library header . + */ +#if __STDC_VERSION__ >= 199901 || __cplusplus >= 201103L #undef LLONG_MIN #undef LLONG_MAX -- cgit v1.2.3-18-g5258