From 9abff04e506fe0b86485909434d4dc3b6011c463 Mon Sep 17 00:00:00 2001 From: Arthur O'Dwyer Date: Sun, 4 Apr 2021 18:05:12 -0400 Subject: [PATCH] [libc++] Fix test_macros.h in the same way as commit 49e5a896 fixed __config. Since D99515, this header triggers -Wundef on Mac OSX older than 10.15. This is now fixed. --- libcxx/test/support/test_macros.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h index a82b434..f4d3ab6 100644 --- a/libcxx/test/support/test_macros.h +++ b/libcxx/test/support/test_macros.h @@ -215,10 +215,10 @@ # elif defined(__APPLE__) // timespec_get and aligned_alloc were introduced in macOS 10.15 and // aligned releases -# if (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101500 || \ - __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 130000 || \ - __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ >= 130000 || \ - __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ >= 60000) +# if ((defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101500) || \ + (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 130000) || \ + (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ >= 130000) || \ + (defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ >= 60000)) # define TEST_HAS_ALIGNED_ALLOC # define TEST_HAS_TIMESPEC_GET # endif -- 2.7.4