diff options
| author | dim <dim@FreeBSD.org> | 2014-11-24 18:11:16 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-11-24 18:11:16 +0000 |
| commit | 6148c19c738a92f344008aa3f88f4e008bada0ee (patch) | |
| tree | d4426858455f04d0d8c25a2f9eb9ea5582ffe1b6 /contrib/llvm/tools/clang/lib/Headers/limits.h | |
| parent | 2c8643c6396b0a3db33430cf9380e70bbb9efce0 (diff) | |
| parent | 173a4f43a911175643bda81ee675e8d9269056ea (diff) | |
| download | FreeBSD-src-6148c19c738a92f344008aa3f88f4e008bada0ee.zip FreeBSD-src-6148c19c738a92f344008aa3f88f4e008bada0ee.tar.gz | |
Merge clang 3.5.0 release from ^/vendor/clang/dist, resolve conflicts,
and preserve our customizations, where necessary.
Diffstat (limited to 'contrib/llvm/tools/clang/lib/Headers/limits.h')
| -rw-r--r-- | contrib/llvm/tools/clang/lib/Headers/limits.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/llvm/tools/clang/lib/Headers/limits.h b/contrib/llvm/tools/clang/lib/Headers/limits.h index 91bd404..f04187c 100644 --- a/contrib/llvm/tools/clang/lib/Headers/limits.h +++ b/contrib/llvm/tools/clang/lib/Headers/limits.h @@ -33,8 +33,7 @@ /* System headers include a number of constants from POSIX in <limits.h>. Include it if we're hosted. */ -#if __STDC_HOSTED__ && \ - defined(__has_include_next) && __has_include_next(<limits.h>) +#if __STDC_HOSTED__ && __has_include_next(<limits.h>) #include_next <limits.h> #endif @@ -90,7 +89,7 @@ /* 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 +#if __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L #undef LLONG_MIN #undef LLONG_MAX |
