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/float.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/float.h')
| -rw-r--r-- | contrib/llvm/tools/clang/lib/Headers/float.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/tools/clang/lib/Headers/float.h b/contrib/llvm/tools/clang/lib/Headers/float.h index 2cb13d3..02ef6bf 100644 --- a/contrib/llvm/tools/clang/lib/Headers/float.h +++ b/contrib/llvm/tools/clang/lib/Headers/float.h @@ -29,7 +29,7 @@ * For more details see http://msdn.microsoft.com/en-us/library/y0ybw9fy.aspx */ #if (defined(__MINGW32__) || defined(_MSC_VER)) && \ - defined(__has_include_next) && __has_include_next(<float.h>) + __has_include_next(<float.h>) # include_next <float.h> /* Undefine anything that we'll be redefining below. */ |
