commit ff702ad727d958426c222c45123085c5f943ab89
author Mojca Miklavec <mojca.miklavec.lists@gmail.com> Sun Feb 28 09:34:30 2021 +0100
committer Shane F. Carr <shane@unicode.org> Wed Apr 07 13:47:42 2021 -0500
tree 76e81bf3e178ccfed014469193e447200ca81be3
parent b926f52688603fbcfb1df082b2711850b3127007

ICU-21513 check if TARGET_OS_SIMULATOR has been defined

clang 11 throws an error when using undefined variables starting with
TARGET_OS_, and TARGET_OS_SIMULATOR is missing in earlier versions
of macOS, so the code would not compile without an additional guard.

See also ICU-13440.

icu4c/source/common/putil.cpp

diff --git a/icu4c/source/common/putil.cpp b/icu4c/source/common/putil.cpp
index 9386647..ffcbbcc 100644
--- a/icu4c/source/common/putil.cpp
+++ b/icu4c/source/common/putil.cpp
@@ -1361,7 +1361,7 @@
 
 /* Backup setting of ICU_DATA_DIR_PREFIX_ENV_VAR
    (needed for some Darwin ICU build environments) */
-#if U_PLATFORM_IS_DARWIN_BASED && TARGET_OS_SIMULATOR
+#if U_PLATFORM_IS_DARWIN_BASED && defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
 # if !defined(ICU_DATA_DIR_PREFIX_ENV_VAR)
 #  define ICU_DATA_DIR_PREFIX_ENV_VAR "IPHONE_SIMULATOR_ROOT"
 # endif