From: Jeff Genovy <29107334+jefgen@users.noreply.github.com>
Date: Thu, 15 Feb 2018 22:37:22 +0000 (+0000)
Subject: ICU-12647 Fix build break on Windows.
X-Git-Tag: release-61-rc~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4298f41e35545039705dec46f29537c8997834a5;p=icu

ICU-12647 Fix build break on Windows.
('IN' is already defined in a Windows header, so it conflicts with the variable IN.)

X-SVN-Rev: 40925
---

diff --git a/icu4c/source/i18n/regexcmp.cpp b/icu4c/source/i18n/regexcmp.cpp
index 4e9ad6ae4d7..ebfb024a8a1 100644
--- a/icu4c/source/i18n/regexcmp.cpp
+++ b/icu4c/source/i18n/regexcmp.cpp
@@ -4450,11 +4450,11 @@ UnicodeSet *RegexCompile::createSetForProperty(const UnicodeString &propName, UB
     //    See if the property looks like a Java "InBlockName", which
     //    we will recast as "Block=BlockName"
     //
-    static const UChar IN[] = {0x49, 0x6E, 0};  // "In"
-    static const UChar BLOCK[] = {0x42, 0x6C, 0x6f, 0x63, 0x6b, 0x3d, 00};  // "Block="
-    if (mPropName.startsWith(IN, 2) && propName.length()>=3) {
+    static const UChar strIN[] = {0x49, 0x6E, 0};  // "In"
+    static const UChar strBLOCK[] = {0x42, 0x6C, 0x6f, 0x63, 0x6b, 0x3d, 00};  // "Block="
+    if (mPropName.startsWith(strIN, 2) && propName.length()>=3) {
         setExpr.truncate(4);   // Leaves "[\p{", or "[\P{"
-        setExpr.append(BLOCK, -1);
+        setExpr.append(strBLOCK, -1);
         setExpr.append(UnicodeString(mPropName, 2));  // Property with the leading "In" removed.
         setExpr.append(chRBrace);
         setExpr.append(chRBracket);