Bug 20981: On Windows, check TZ for timezone first

arthuredelstein · Jan 14, 2017 · 0a6e320509242bc78b67d0c64b68724317c5a0a1 · 0a6e320
1 parent 0357c67
commit 0a6e320509242bc78b67d0c64b68724317c5a0a1
Showing with 7 additions and 0 deletions.

+7 −0 intl/icu/source/common/putil.cpp
diff --git a/intl/icu/source/common/putil.cpp b/intl/icu/source/common/putil.cpp
@@ -984,6 +984,13 @@ uprv_tzname(int n)
 {
     const char *tzid = NULL;
 #if U_PLATFORM_USES_ONLY_WIN32_API
+    char* envValue = getenv("TZ");
+    if (envValue != NULL) {
+      char *tmpTzid = (char*) uprv_malloc(uprv_strlen(envValue) + 1);
+      uprv_strcpy(tmpTzid, envValue);
+      return tmpTzid;
+    }
+
     tzid = uprv_detectWindowsTimeZone();
 
     if (tzid != NULL) {