ICU-8452 Update Cygwin MSVC handling by defining CYGWINMSVC

X-SVN-Rev: 30546

diff --git a/icu4c/source/common/unicode/platform.h b/icu4c/source/common/unicode/platform.h
index adabf07c1d03fb77d5cc088c657c0bea1a66d9de..b93a90a48ddb04da87a31aa0a82d5580c7c75ac0 100644 (file)
--- a/icu4c/source/common/unicode/platform.h
+++ b/icu4c/source/common/unicode/platform.h
@@ -167,9 +167,11 @@
  * Otherwise undefined.
  * @internal
  */
+/* Commented out because this is already set in mh-cygwin-msvc
 #if U_PLATFORM == U_PF_CYGWIN && defined(_MSC_VER)
 #   define CYGWINMSVC
 #endif
+*/
 
 /**
  * \def U_PLATFORM_USES_ONLY_WIN32_API

diff --git a/icu4c/source/config/mh-cygwin-msvc b/icu4c/source/config/mh-cygwin-msvc
index 053ee48dae50aad53bcf252b5e3a85f99f6e247f..4a0489bd30688ded0d61a169a5dba0501e70dfba 100644 (file)
--- a/icu4c/source/config/mh-cygwin-msvc
+++ b/icu4c/source/config/mh-cygwin-msvc
@@ -48,7 +48,7 @@ endif
 CFLAGS+=/GF /nologo
 CXXFLAGS+=/GF /nologo /EHsc /Zc:wchar_t
 CPPFLAGS+=-D_CRT_SECURE_NO_DEPRECATE
-DEFS+=-DWIN32 -D__CYGWIN__
+DEFS+=-DWIN32 -DCYGWINMSVC
 LDFLAGS+=/nologo
 
 # Commands to compile