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 90c7c019d23a388bc8a22b09d50d241c908f272a..0532838caf9bdb8a7b66ee2a28e40828608d4eca 100644 (file)
--- 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 de512ff11664c9e188b287ce7cdfad893e276c8e..b52010f8aed3d4fe460a8692460c4a747a273707 100644 (file)
--- 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 */