diff options
Diffstat (limited to 'libcxx/test')
-rw-r--r-- | libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp | 4 | ||||
-rw-r--r-- | libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp b/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp index 07ffa0b7551..cc566d069f7 100644 --- a/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp +++ b/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp @@ -87,11 +87,9 @@ int main() static_assert((std::is_same<decltype(srand(0)), void>::value), ""); // Microsoft does not implement aligned_alloc in their C library -#ifndef TEST_COMPILER_C1XX -#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) +#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && !defined(_WIN32) static_assert((std::is_same<decltype(aligned_alloc(0,0)), void*>::value), ""); #endif -#endif static_assert((std::is_same<decltype(calloc(0,0)), void*>::value), ""); static_assert((std::is_same<decltype(free(0)), void>::value), ""); diff --git a/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp b/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp index e9dda6cee4e..02c8c9fd8bb 100644 --- a/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp +++ b/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp @@ -75,10 +75,8 @@ int main() static_assert((std::is_same<decltype(std::srand(0)), void>::value), ""); // Microsoft does not implement aligned_alloc in their C library -#ifndef TEST_COMPILER_C1XX -#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) - static_assert((std::is_same<decltype(std::aligned_alloc(0,0)), void*>::value), ""); -#endif +#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && !defined(_WIN32) + static_assert((std::is_same<decltype(aligned_alloc(0,0)), void*>::value), ""); #endif static_assert((std::is_same<decltype(std::calloc(0,0)), void*>::value), ""); |