STL_MSFT created this revision. STL_MSFT added reviewers: EricWF, mclow.lists. STL_MSFT added a subscriber: cfe-commits.
There's a macro scheme already being used for __has_feature etc. Use it for __has_include too, which makes MSVC happy (it doesn't support __has_include yet, and unguarded use explodes horribly). https://reviews.llvm.org/D25251 Files: test/support/test_macros.h Index: test/support/test_macros.h =================================================================== --- test/support/test_macros.h +++ test/support/test_macros.h @@ -22,6 +22,12 @@ #define TEST_HAS_FEATURE(X) 0 #endif +#ifdef __has_include +#define TEST_HAS_INCLUDE(X) __has_include(X) +#else +#define TEST_HAS_INCLUDE(X) 0 +#endif + #ifdef __has_extension #define TEST_HAS_EXTENSION(X) __has_extension(X) #else @@ -63,7 +69,7 @@ #endif // Attempt to deduce GCC version -#if defined(_LIBCPP_VERSION) && __has_include(<features.h>) +#if defined(_LIBCPP_VERSION) && TEST_HAS_INCLUDE(<features.h>) #include <features.h> #define TEST_HAS_GLIBC #define TEST_GLIBC_PREREQ(major, minor) __GLIBC_PREREQ(major, minor)
Index: test/support/test_macros.h =================================================================== --- test/support/test_macros.h +++ test/support/test_macros.h @@ -22,6 +22,12 @@ #define TEST_HAS_FEATURE(X) 0 #endif +#ifdef __has_include +#define TEST_HAS_INCLUDE(X) __has_include(X) +#else +#define TEST_HAS_INCLUDE(X) 0 +#endif + #ifdef __has_extension #define TEST_HAS_EXTENSION(X) __has_extension(X) #else @@ -63,7 +69,7 @@ #endif // Attempt to deduce GCC version -#if defined(_LIBCPP_VERSION) && __has_include(<features.h>) +#if defined(_LIBCPP_VERSION) && TEST_HAS_INCLUDE(<features.h>) #include <features.h> #define TEST_HAS_GLIBC #define TEST_GLIBC_PREREQ(major, minor) __GLIBC_PREREQ(major, minor)
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
