From: Don <don.j.olmstead@gmail.com>
Date: Tue, 18 Sep 2018 17:18:25 +0000 (-0700)
Subject: ICU-20136 Check U_HAVE_TZ* values (#114)
X-Git-Tag: release-63-rc~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d55773ce2891eec3787b7974997f5ea032edb099;p=icu

ICU-20136 Check U_HAVE_TZ* values (#114)

* Add check for U_HAVE_TZSET

* Add check for U_HAVE_TZNAME
---

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 */