Author: rsmith
Date: Wed Feb 19 16:53:42 2014
New Revision: 201731
URL: http://llvm.org/viewvc/llvm-project?rev=201731&view=rev
Log:
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.
Modified:
cfe/trunk/lib/Headers/float.h
cfe/trunk/lib/Headers/limits.h
cfe/trunk/lib/Headers/stdint.h
Modified: cfe/trunk/lib/Headers/float.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/float.h?rev=201731&r1=201730&r2=201731&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/float.h (original)
+++ cfe/trunk/lib/Headers/float.h Wed Feb 19 16:53:42 2014
@@ -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. */
Modified: cfe/trunk/lib/Headers/limits.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/limits.h?rev=201731&r1=201730&r2=201731&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/limits.h (original)
+++ cfe/trunk/lib/Headers/limits.h Wed Feb 19 16:53:42 2014
@@ -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
Modified: cfe/trunk/lib/Headers/stdint.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/stdint.h?rev=201731&r1=201730&r2=201731&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/stdint.h (original)
+++ cfe/trunk/lib/Headers/stdint.h Wed Feb 19 16:53:42 2014
@@ -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
//
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
