From: Steven R. Loomis <srl@icu-project.org>
Date: Tue, 4 Oct 2016 04:01:33 +0000 (+0000)
Subject: ICU-12783 umutex patch for cygwin, merge r39417
X-Git-Tag: milestone-59-0-1~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ea904d7348a87556398ae5ad1b29ed9184fe9af;p=icu

ICU-12783 umutex patch for cygwin, merge r39417

X-SVN-Rev: 39422
---

diff --git a/icu4c/source/common/umutex.cpp b/icu4c/source/common/umutex.cpp
index 90c7c019d23..0532838caf9 100644
--- a/icu4c/source/common/umutex.cpp
+++ b/icu4c/source/common/umutex.cpp
@@ -39,16 +39,7 @@ static UMutex   globalMutex = U_MUTEX_INITIALIZER;
 // Build time user mutex hook: #include "U_USER_MUTEX_CPP"
 #include U_MUTEX_XSTR(U_USER_MUTEX_CPP)
 
-#elif U_PLATFORM_HAS_WIN32_API
-
-//-------------------------------------------------------------------------------------------
-//
-//    Windows Specific Definitions
-//
-//        Note: Cygwin (and possibly others) have both WIN32 and POSIX.
-//              Prefer Win32 in these cases.  (Win32 comes ahead in the #if chain)
-//
-//-------------------------------------------------------------------------------------------
+#elif U_PLATFORM_USES_ONLY_WIN32_API
 
 #if defined U_NO_PLATFORM_ATOMICS
 #error ICU on Win32 requires support for low level atomic operations.
diff --git a/icu4c/source/common/umutex.h b/icu4c/source/common/umutex.h
index de512ff1166..b52010f8aed 100644
--- a/icu4c/source/common/umutex.h
+++ b/icu4c/source/common/umutex.h
@@ -320,13 +320,7 @@ U_NAMESPACE_END
 // #inlcude "U_USER_MUTEX_H"
 #include U_MUTEX_XSTR(U_USER_MUTEX_H)
 
-#elif U_PLATFORM_HAS_WIN32_API
-
-/* Windows Definitions.
- *    Windows comes first in the platform chain.
- *    Cygwin (and possibly others) have both WIN32 and POSIX APIs. Prefer Win32 in this case.
- */
-
+#elif U_PLATFORM_USES_ONLY_WIN32_API
 
 /* For CRITICAL_SECTION */