diff options
| author | JF Bastien <jfb@chromium.org> | 2013-10-28 08:58:05 -0700 |
|---|---|---|
| committer | JF Bastien <jfb@chromium.org> | 2013-10-28 08:58:05 -0700 |
| commit | 5b8e932d70fcf281e193aebfd0d3ac55d057f2da (patch) | |
| tree | 232595404c15e117af80f0415622ce3a6c331d0e /lib/Headers | |
| parent | 96f3e19c98507a181be89a85f6e7b4db711a3f45 (diff) | |
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
Diffstat (limited to 'lib/Headers')
| -rw-r--r-- | lib/Headers/limits.h | 6 |
1 files changed, 4 insertions, 2 deletions
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 <limits.h>. + */ +#if __STDC_VERSION__ >= 199901 || __cplusplus >= 201103L #undef LLONG_MIN #undef LLONG_MAX |