From d55773ce2891eec3787b7974997f5ea032edb099 Mon Sep 17 00:00:00 2001 From: Don Date: Tue, 18 Sep 2018 10:18:25 -0700 Subject: [PATCH] ICU-20136 Check U_HAVE_TZ* values (#114) * Add check for U_HAVE_TZSET * Add check for U_HAVE_TZNAME --- icu4c/source/common/putilimp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icu4c/source/common/putilimp.h b/icu4c/source/common/putilimp.h index 44f5bf34429..d2cc37cde37 100644 --- a/icu4c/source/common/putilimp.h +++ b/icu4c/source/common/putilimp.h @@ -94,7 +94,7 @@ typedef size_t uintptr_t; # define U_NL_LANGINFO_CODESET CODESET #endif -#ifdef U_TZSET +#if defined(U_TZSET) || defined(U_HAVE_TZSET) /* Use the predefined value. */ #elif U_PLATFORM_USES_ONLY_WIN32_API // UWP doesn't support tzset or environment variables for tz @@ -132,7 +132,7 @@ typedef size_t uintptr_t; # define U_TIMEZONE timezone #endif -#ifdef U_TZNAME +#if defined(U_TZNAME) || defined(U_HAVE_TZNAME) /* Use the predefined value. */ #elif U_PLATFORM_USES_ONLY_WIN32_API /* not usable on all windows platforms */ -- 2.50.1