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 44f5bf344292eeba7c4bf9131d58619fb6f120fb..d2cc37cde37833045e8ccdfb0df54a15c5b93d3e 100644 (file)
--- 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 */