From 7d99ba4e578f3f10f6319b26873edb41ce557046 Mon Sep 17 00:00:00 2001 From: kbrow1i Date: Thu, 4 Oct 2018 17:10:00 -0400 Subject: [PATCH] ICU-20191 Don't use Win32 APIs on Cygwin (#185) This was fixed in earlier commits (see, for example, ICU-12786), but the problem was reintroduced in commits f8ba68e and fcb82cb. --- icu4c/source/common/putil.cpp | 2 +- icu4c/source/common/wintz.cpp | 4 ++-- icu4c/source/common/wintz.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/icu4c/source/common/putil.cpp b/icu4c/source/common/putil.cpp index c4e61e2378..769309b422 100644 --- a/icu4c/source/common/putil.cpp +++ b/icu4c/source/common/putil.cpp @@ -1737,7 +1737,7 @@ The leftmost codepage (.xxx) wins. return posixID; -#elif U_PLATFORM_HAS_WIN32_API +#elif U_PLATFORM_USES_ONLY_WIN32_API #define POSIX_LOCALE_CAPACITY 64 UErrorCode status = U_ZERO_ERROR; char *correctedPOSIXLocale = nullptr; diff --git a/icu4c/source/common/wintz.cpp b/icu4c/source/common/wintz.cpp index 9cf79d7b4a..5e9ac0d2f3 100644 --- a/icu4c/source/common/wintz.cpp +++ b/icu4c/source/common/wintz.cpp @@ -13,7 +13,7 @@ #include "unicode/utypes.h" -#if U_PLATFORM_HAS_WIN32_API +#if U_PLATFORM_USES_ONLY_WIN32_API #include "wintz.h" #include "cmemory.h" @@ -123,4 +123,4 @@ uprv_detectWindowsTimeZone() } U_NAMESPACE_END -#endif /* U_PLATFORM_HAS_WIN32_API */ +#endif /* U_PLATFORM_USES_ONLY_WIN32_API */ diff --git a/icu4c/source/common/wintz.h b/icu4c/source/common/wintz.h index 19b7cfe921..f98b1779b5 100644 --- a/icu4c/source/common/wintz.h +++ b/icu4c/source/common/wintz.h @@ -16,7 +16,7 @@ #include "unicode/utypes.h" -#if U_PLATFORM_HAS_WIN32_API +#if U_PLATFORM_USES_ONLY_WIN32_API /** * \file @@ -31,6 +31,6 @@ U_CDECL_END U_CFUNC const char* U_EXPORT2 uprv_detectWindowsTimeZone(); -#endif /* U_PLATFORM_HAS_WIN32_API */ +#endif /* U_PLATFORM_USES_ONLY_WIN32_API */ #endif /* __WINTZ */