]> granicus.if.org Git - icu/commitdiff
ICU-12784 do not redeclare U_TZNAME on cygwin (patch)
authorSteven R. Loomis <srl@icu-project.org>
Fri, 7 Apr 2017 17:49:26 +0000 (17:49 +0000)
committerSteven R. Loomis <srl@icu-project.org>
Fri, 7 Apr 2017 17:49:26 +0000 (17:49 +0000)
X-SVN-Rev: 40005

icu4c/source/common/putil.cpp

index 011e6e178f8c9bf680afedca2ad2eedb3d79e8aa..a0fa0f1f676d9b50330475cb3586709e318ee300 100644 (file)
@@ -666,7 +666,7 @@ uprv_timezone()
 /* Note that U_TZNAME does *not* have to be tzname, but if it is,
    some platforms need to have it declared here. */
 
-#if defined(U_TZNAME) && (U_PLATFORM == U_PF_IRIX || U_PLATFORM_IS_DARWIN_BASED || (U_PLATFORM == U_PF_CYGWIN && !U_PLATFORM_USES_ONLY_WIN32_API))
+#if defined(U_TZNAME) && (U_PLATFORM == U_PF_IRIX || U_PLATFORM_IS_DARWIN_BASED)
 /* RS6000 and others reject char **tzname.  */
 extern U_IMPORT char *U_TZNAME[];
 #endif