From c8644ae1e98c38e44460f50cf9eeba979b32a7e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Mon, 31 May 2021 09:32:51 +0000 Subject: [PATCH] [libcxx] Define LIBCPP_HAS_TIMESPEC_GET for MSVC configurations This define was out of sync with the corresponding define in tests, it was added inconsistently in 171c77b7dad4a050aca23ff7ca1b75f87560fefb. Modern MSVC environments do have these typedefs and functions. Differential Revision: https://reviews.llvm.org/D103398 --- libcxx/include/__config | 3 +++ libcxx/test/libcxx/language.support/has_timespec_get.compile.pass.cpp | 2 -- libcxx/test/std/language.support/support.runtime/ctime.pass.cpp | 2 -- libcxx/test/std/utilities/time/date.time/ctime.pass.cpp | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libcxx/include/__config b/libcxx/include/__config index dcb134b..855b850 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -390,6 +390,9 @@ # define _LIBCPP_HAS_QUICK_EXIT # define _LIBCPP_HAS_TIMESPEC_GET # endif +# elif defined(_LIBCPP_MSVCRT) + // Using Microsoft's C Runtime library, not MinGW +# define _LIBCPP_HAS_TIMESPEC_GET # elif defined(__APPLE__) // timespec_get and aligned_alloc were introduced in macOS 10.15 and // aligned releases diff --git a/libcxx/test/libcxx/language.support/has_timespec_get.compile.pass.cpp b/libcxx/test/libcxx/language.support/has_timespec_get.compile.pass.cpp index a68a7ea..8b86a5e 100644 --- a/libcxx/test/libcxx/language.support/has_timespec_get.compile.pass.cpp +++ b/libcxx/test/libcxx/language.support/has_timespec_get.compile.pass.cpp @@ -8,8 +8,6 @@ // UNSUPPORTED: c++03, c++11, c++14 -// XFAIL: LIBCXX-WINDOWS-FIXME - // Make sure TEST_HAS_TIMESPEC_GET (defined by the test suite) and // _LIBCPP_HAS_TIMESPEC_GET (defined by libc++) stay in sync. diff --git a/libcxx/test/std/language.support/support.runtime/ctime.pass.cpp b/libcxx/test/std/language.support/support.runtime/ctime.pass.cpp index d52581d..df82779 100644 --- a/libcxx/test/std/language.support/support.runtime/ctime.pass.cpp +++ b/libcxx/test/std/language.support/support.runtime/ctime.pass.cpp @@ -8,8 +8,6 @@ // test -// XFAIL: LIBCXX-WINDOWS-FIXME - #include #include #include "test_macros.h" diff --git a/libcxx/test/std/utilities/time/date.time/ctime.pass.cpp b/libcxx/test/std/utilities/time/date.time/ctime.pass.cpp index 4a1fda0..8ad3cca 100644 --- a/libcxx/test/std/utilities/time/date.time/ctime.pass.cpp +++ b/libcxx/test/std/utilities/time/date.time/ctime.pass.cpp @@ -6,8 +6,6 @@ // //===----------------------------------------------------------------------===// -// XFAIL: LIBCXX-WINDOWS-FIXME - #include #include -- 2.7.4