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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@201731 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Headers/float.h b/lib/Headers/float.h
index 2cb13d3ed5517b13366ed4de93b33c0c266cae96..02ef6bf611a352237517454258db91fff2682316 100644 (file)
--- a/lib/Headers/float.h
+++ b/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/lib/Headers/limits.h b/lib/Headers/limits.h
index 91bd404650e8edcf57aa79a87503cfeee4d01d31..68efbc373ebd5a1e99e4fac87546d29f6900527b 100644 (file)
--- a/lib/Headers/limits.h
+++ b/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/lib/Headers/stdint.h b/lib/Headers/stdint.h
index 11529c0c674b39307f3526e97519c30ad832d4f4..2b1bc099dca10a6084a22b509012b556b8321aaf 100644 (file)
--- a/lib/Headers/stdint.h
+++ b/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
 //