summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2014-02-19 22:53:42 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2014-02-19 22:53:42 +0000
commit294e59a33b2d7d8c179727e2c86f42039274481d (patch)
treeba3cf96707257ae6b7525a57e335a031d225ce68 /clang
parented3f0693cbd0b8161614e644d9c8c195e1b57dd1 (diff)
downloadbcm5719-llvm-294e59a33b2d7d8c179727e2c86f42039274481d.tar.gz
bcm5719-llvm-294e59a33b2d7d8c179727e2c86f42039274481d.zip
Remove a broken attempt to cope with someone #undef'ing __has_include_next.
This was broken because __has_include_next(...) would not be valid in a preprocessor condition if __has_include_next is not defined. llvm-svn: 201731
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/Headers/float.h2
-rw-r--r--clang/lib/Headers/limits.h3
-rw-r--r--clang/lib/Headers/stdint.h3
3 files changed, 3 insertions, 5 deletions
diff --git a/clang/lib/Headers/float.h b/clang/lib/Headers/float.h
index 2cb13d3ed55..02ef6bf611a 100644
--- a/clang/lib/Headers/float.h
+++ b/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. */
diff --git a/clang/lib/Headers/limits.h b/clang/lib/Headers/limits.h
index 91bd404650e..68efbc373eb 100644
--- a/clang/lib/Headers/limits.h
+++ b/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
diff --git a/clang/lib/Headers/stdint.h b/clang/lib/Headers/stdint.h
index 11529c0c674..2b1bc099dca 100644
--- a/clang/lib/Headers/stdint.h
+++ b/clang/lib/Headers/stdint.h
@@ -28,8 +28,7 @@
/* If we're hosted, fall back to the system's stdint.h, which might have
* additional definitions.
*/
-#if __STDC_HOSTED__ && \
- defined(__has_include_next) && __has_include_next(<stdint.h>)
+#if __STDC_HOSTED__ && __has_include_next(<stdint.h>)
// C99 7.18.3 Limits of other integer types
//
OpenPOWER on IntegriCloud